Minimizing the footprint of the apache-tools patch.

1 files changed, 26 insertions, 47 deletions

diff --git a/2.2/patches/03_all_gentoo-apache-tools.patch b/2.2/patches/03_all_gentoo-apache-tools.patch
index 1bb7e09..9958d07 100644
--- a/2.2/patches/03_all_gentoo-apache-tools.patch
+++ b/2.2/patches/03_all_gentoo-apache-tools.patch
@@ -1,18 +1,27 @@
+---
+ Makefile.in         |   10 ++++++++--
+ support/Makefile.in |   18 ++++--------------
+ 2 files changed, 12 insertions(+), 16 deletions(-)
+
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -198,14 +198,15 @@ install-include:
+@@ -198,14 +198,20 @@ install-include:
  	  $(INSTALL_DATA) $$hdr $(DESTDIR)$(includedir); \
  	done
  
-+MAN8=httpd.8 suexec.8
++MAN1=
++MAN8=apxs.8 httpd.8 suexec.8
  install-man:
  	@echo Installing man pages and online manual
  	@test -d $(DESTDIR)$(mandir)      || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)
--	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
+ 	@test -d $(DESTDIR)$(mandir)/man1 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man1
  	@test -d $(DESTDIR)$(mandir)/man8 || $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man8
  	@test -d $(DESTDIR)$(manualdir)   || $(MKINSTALLDIRS) $(DESTDIR)$(manualdir)
 -	@cp -p $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
 -	@cp -p $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
++	@for i in $(MAN1) ; do \
++		cp -p $(top_srcdir)/docs/man/$$i $(DESTDIR)$(mandir)/man1; \
++	done
 +	@for i in $(MAN8) ; do \
 +		cp -p $(top_srcdir)/docs/man/$$i $(DESTDIR)$(mandir)/man8; \
 +	done
@@ -21,18 +30,19 @@
  	else \
 --- a/support/Makefile.in
 +++ b/support/Makefile.in
-@@ -1,9 +1,4 @@
+@@ -1,9 +1,8 @@
 -DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
 -	logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
--
--CLEAN_TARGETS = suexec
--
++DISTCLEAN_TARGETS = apxs
+ 
+ CLEAN_TARGETS = suexec
+ 
 -PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm htcacheclean httxt2dbm
-+PROGRAMS = suexec
++PROGRAMS = apxs
  TARGETS  = $(PROGRAMS)
  
  PROGRAM_LDADD        = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
-@@ -12,61 +7,14 @@ PROGRAM_DEPENDENCIES = 
+@@ -12,22 +11,13 @@ PROGRAM_DEPENDENCIES = 
  include $(top_builddir)/build/rules.mk
  
  install:
@@ -53,46 +63,15 @@
 -	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
 -	    fi ; \
 -	fi
--
--htpasswd_OBJECTS = htpasswd.lo
--htpasswd: $(htpasswd_OBJECTS)
--	$(LINK) $(htpasswd_LTFLAGS) $(htpasswd_OBJECTS) $(PROGRAM_LDADD)
--
--htdigest_OBJECTS = htdigest.lo
--htdigest: $(htdigest_OBJECTS)
--	$(LINK) $(htdigest_LTFLAGS) $(htdigest_OBJECTS) $(PROGRAM_LDADD)
--
--rotatelogs_OBJECTS = rotatelogs.lo
--rotatelogs: $(rotatelogs_OBJECTS)
--	$(LINK) $(rotatelogs_LTFLAGS) $(rotatelogs_OBJECTS) $(PROGRAM_LDADD)
--
--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_LDADD = $(PROGRAM_LDADD) $(SSL_LIBS)
--ab: $(ab_OBJECTS)
--	$(LINK) $(ab_LTFLAGS) $(ab_OBJECTS) $(ab_LDADD)
--
--checkgid_OBJECTS = checkgid.lo
--checkgid: $(checkgid_OBJECTS)
--	$(LINK) $(checkgid_LTFLAGS) $(checkgid_OBJECTS) $(PROGRAM_LDADD)
+ 
+ htpasswd_OBJECTS = htpasswd.lo
+ htpasswd: $(htpasswd_OBJECTS)
+@@ -60,7 +50,7 @@ checkgid: $(checkgid_OBJECTS)
  
  suexec_OBJECTS = suexec.lo
  suexec: $(suexec_OBJECTS)
 -	$(LINK) $(suexec_OBJECTS)
--
--htcacheclean_OBJECTS = htcacheclean.lo
--htcacheclean: $(htcacheclean_OBJECTS)
--	$(LINK) $(htcacheclean_LTFLAGS) $(htcacheclean_OBJECTS) $(PROGRAM_LDADD)
--
--httxt2dbm_OBJECTS = httxt2dbm.lo
--httxt2dbm: $(httxt2dbm_OBJECTS)
--	$(LINK) $(httxt2dbm_LTFLAGS) $(httxt2dbm_OBJECTS) $(PROGRAM_LDADD)
--
 +	$(LINK) -Wl,-z,now $(suexec_OBJECTS)
+ 
+ htcacheclean_OBJECTS = htcacheclean.lo
+ htcacheclean: $(htcacheclean_OBJECTS)