Allow 'make install DESTDIR=/path'. This allows packagers to install

[apache] / support / Makefile.in

diff --git a/support/Makefile.in b/support/Makefile.in
index 242403a7b5a6cf19547220118b8a6729a393ed05..cbfd53099aa63415fc754edacd13a674a92730f9 100644 (file)
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -1,26 +1,31 @@
 DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
        logresolve.pl phf_abuse_log.cgi split-logfile
 
-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid
+PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm
 TARGETS  = $(PROGRAMS)
 
-PROGRAM_LDADD        = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
-PROGRAM_DEPENDENCIES = \
-       $(top_builddir)/srclib/apr-util/libaprutil.la \
-       $(top_builddir)/srclib/apr/libapr.la
+PROGRAM_LDADD        = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
+PROGRAM_DEPENDENCIES = 
 
 include $(top_builddir)/build/rules.mk
 
 install:
-       @test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
-       @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 $(DESTDIR)$(sbindir); \
+           if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
+               cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
+           fi ; \
+       fi
 
 htpasswd_OBJECTS = htpasswd.lo
 htpasswd: $(htpasswd_OBJECTS)
@@ -38,6 +43,10 @@ logresolve_OBJECTS = logresolve.lo
 logresolve: $(logresolve_OBJECTS)
        $(LINK) $(logresolve_LTFLAGS) $(logresolve_OBJECTS) $(PROGRAM_LDADD)
 
+htdbm_OBJECTS = htdbm.lo
+htdbm: $(htdbm_OBJECTS)
+       $(LINK) $(htdbm_LTFLAGS) $(htdbm_OBJECTS) $(PROGRAM_LDADD)
+
 ab_OBJECTS = ab.lo
 ab: $(ab_OBJECTS)
        $(LINK) $(ab_LTFLAGS) $(ab_OBJECTS) $(PROGRAM_LDADD)
@@ -46,7 +55,9 @@ checkgid_OBJECTS = checkgid.lo
 checkgid: $(checkgid_OBJECTS)
        $(LINK) $(checkgid_LTFLAGS) $(checkgid_OBJECTS) $(PROGRAM_LDADD)
 
+# suexec must be statically compiled. Otherwise it is not relocatable,
+# since LD_* environment variables are ignored in setuid programs.
 suexec_OBJECTS = suexec.lo
 suexec: $(suexec_OBJECTS)
-       $(LINK) $(suexec_OBJECTS) $(PROGRAM_LDADD)
+       $(LINK) -static $(suexec_OBJECTS) $(PROGRAM_LDADD)