From: Ryan Bloom <rbb@apache.org>
Date: Fri, 13 Apr 2001 00:46:22 +0000 (+0000)
Subject: Do not install the binaries from the support directory twice.
X-Git-Tag: 2.0.17~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=575247be29bb32ef84bc649928adf9f053429502;p=thirdparty%2Fapache%2Fhttpd.git

Do not install the binaries from the support directory twice.
PR:	7490
Submitted by:	jun-ichiro hagino <itojun@iijlab.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88836 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index f38a6f39632..a5b189d8ad2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 Changes with Apache 2.0.17-dev
 
+  *) Do not install the binaries from the support directory twice.
+     [jun-ichiro hagino <itojun@iijlab.net>]
+
   *) The ap_f* functions should flush data to the filter that is passed
      in, not the the filter after the one passed in.
      [Ryan Morgan <rmorgan@covalent.net>]
diff --git a/Makefile.in b/Makefile.in
index b5e3bc9ef95..0c10e6fb525 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,7 @@ PROGRAMS        = $(PROGRAM_NAME)
 targets         = $(PROGRAMS) $(other_targets)
 phony_targets   = $(srcdir)/buildmark.c
 install_targets = install-conf install-htdocs install-icons install-other \
-	install-cgi install-include install-support install-suexec
+	install-cgi install-include install-suexec
 DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_path.h \
 	modules.c libtool
 EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in \
@@ -75,23 +75,6 @@ install-cgi:
 	@(cd docs/cgi-examples && cp -rp * $(cgidir))
 	@(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
 
-install-support:
-	@echo Installing Support Binaries
-	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
-	@cp -p $(srcdir)/support/httpd.exp $(bindir)
-	@cp -p $(builddir)/support/htpasswd $(bindir)
-	@cp -p $(builddir)/support/htdigest $(bindir)
-	@cp -p $(builddir)/support/rotatelogs $(bindir)
-	@cp -p $(builddir)/support/logresolve $(bindir)
-	@cp -p $(builddir)/support/ab $(bindir)
-	@cp -p $(builddir)/support/apachectl $(bindir)
-	chmod 755 $(bindir)/apachectl
-	@if test -f $(builddir)/support/apxs; then \
-	    cp -p $(builddir)/support/apxs $(bindir); \
-	    chmod 755 $(bindir)/apxs; \
-	fi
-
-
 install-other:
 	@test -d $(logfiledir) || $(MKINSTALLDIRS) $(logfiledir)
 	@for ext in dll x; do \
diff --git a/support/Makefile.in b/support/Makefile.in
index ed1ffc9b70c..ff5f6a4e265 100644
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -10,6 +10,16 @@ PROGRAM_DEPENDENCIES = \
 
 include $(top_srcdir)/build/rules.mk
 
+install:
+	@test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
+	@cp -p httpd.exp $(bindir)
+	@cp -p apachectl $(bindir)
+	chmod 755 $(bindir)/apachectl
+	@if test -f $(builddir)/apxs; then \
+	    cp -p apxs $(bindir); \
+	    chmod 755 $(bindir)/apxs; \
+	fi
+
 htpasswd_OBJECTS = htpasswd.lo
 htpasswd: $(htpasswd_OBJECTS)
 	$(LINK) $(htpasswd_OBJECTS) $(PROGRAM_LDADD)