summaryrefslogtreecommitdiff
path: root/support
diff options
context:
space:
mode:
authorStefan Fritsch <sf@sfritsch.de>2012-02-16 02:47:54 +0100
committerStefan Fritsch <sf@sfritsch.de>2012-02-16 02:47:54 +0100
commit212cb6c2dcb419aaa6c848406136ec05e98c8632 (patch)
tree3c6f8cc25cde8781809bfeb92ebcadac341b1af4 /support
parente072a2dd866b7cb9f14319b80326a4e7fd16fcdf (diff)
downloadapache2-212cb6c2dcb419aaa6c848406136ec05e98c8632.tar.gz
Import upstream release candidate 2.4.1upstream/2.4.1
Diffstat (limited to 'support')
-rw-r--r--support/Makefile.in13
1 files changed, 10 insertions, 3 deletions
diff --git a/support/Makefile.in b/support/Makefile.in
index b840118b..d307eaae 100644
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -3,8 +3,9 @@ DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
CLEAN_TARGETS = suexec
-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT)
-TARGETS = $(PROGRAMS)
+bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm
+sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT)
+TARGETS = $(bin_PROGRAMS) $(sbin_PROGRAMS)
PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
PROGRAM_DEPENDENCIES =
@@ -16,7 +17,13 @@ install:
@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 \
+ @for i in apxs dbmmanage; do \
+ if test -f "$(builddir)/$$i"; then \
+ cp -p $$i $(DESTDIR)$(bindir); \
+ chmod 755 $(DESTDIR)$(bindir)/$$i; \
+ fi ; \
+ done
+ @for i in apachectl; do \
if test -f "$(builddir)/$$i"; then \
cp -p $$i $(DESTDIR)$(sbindir); \
chmod 755 $(DESTDIR)$(sbindir)/$$i; \