diff options
author | Ryan Bloom <rbb@apache.org> | 2002-06-15 06:41:52 +0200 |
---|---|---|
committer | Ryan Bloom <rbb@apache.org> | 2002-06-15 06:41:52 +0200 |
commit | 230b1f5db99069e51d47c45bede703d56341627e (patch) | |
tree | 1c13969dde898916e5d56744bef6eb970d359090 /support/Makefile.in | |
parent | Corrected typo, and added note about Directory sections applying to (diff) | |
download | apache2-230b1f5db99069e51d47c45bede703d56341627e.tar.xz apache2-230b1f5db99069e51d47c45bede703d56341627e.zip |
Allow 'make install DESTDIR=/path'. This allows packagers to install
into a directory different from the one that was configured. This
also mirrors the root= feature from 1.3. We cannot use prefix=,
because both APR and APR-util resolve their installation paths at
configuration time. This means that there is no variable prefix
to replace.
PR: 7803
Submitted by: Andreas Hasenack <andreas@netbank.com.br>
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95686 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'support/Makefile.in')
-rw-r--r-- | support/Makefile.in | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/support/Makefile.in b/support/Makefile.in index 9a3747a464..cbfd53099a 100644 --- a/support/Makefile.in +++ b/support/Makefile.in @@ -10,20 +10,20 @@ PROGRAM_DEPENDENCIES = include $(top_builddir)/build/rules.mk install: - @test -d $(bindir) || $(MKINSTALLDIRS) $(bindir) - @test -d $(sbindir) || $(MKINSTALLDIRS) $(sbindir) - @test -d $(libexecdir) || $(MKINSTALLDIRS) $(libexecdir) - @cp -p $(top_builddir)/server/httpd.exp $(libexecdir) + @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir) + @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) + @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) + @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir) @for i in apxs apachectl dbmmanage; do \ if test -f "$(builddir)/$$i"; then \ - cp -p $$i $(sbindir); \ - chmod 755 $(sbindir)/$$i; \ + cp -p $$i $(DESTDIR)$(sbindir); \ + chmod 755 $(DESTDIR)$(sbindir)/$$i; \ fi ; \ done @if test -f "$(builddir)/envvars-std"; then \ - cp -p envvars-std $(sbindir); \ - if test ! -f $(sbindir)/envvars; then \ - cp -p envvars-std $(sbindir)/envvars ; \ + cp -p envvars-std $(DESTDIR)$(sbindir); \ + if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ + cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ fi ; \ fi |