diff options
| author |   Christian Heim <phreak@gentoo.org> | 2007-05-23 17:56:47 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2007-05-23 17:56:47 +0000 |
| commit | fd4d746147b0026d40119c9b3573e528b6c9a30a (patch) | |
| tree | 15f6cbca36de9f987083b0ad66b60318423a55a0 | |
| parent | Fix a typo in name-based-vhost.conf.example (bug #179522 - thanks to Adrian B... (diff) | |
| download | apache-fd4d746147b0026d40119c9b3573e528b6c9a30a.tar.gz apache-fd4d746147b0026d40119c9b3573e528b6c9a30a.tar.bz2 apache-fd4d746147b0026d40119c9b3573e528b6c9a30a.zip | |
Updated support/ removal patch, moving anything from support/ to apache-tools, also removing the docs/man/* from the top_srcdir Makefile, only installing those really belonging to net-www/apache.
| -rw-r--r-- | 2.2/patches/04_all_gentoo-apache-tools.patch | 99 |
1 files changed, 73 insertions, 26 deletions
diff --git a/2.2/patches/04_all_gentoo-apache-tools.patch b/2.2/patches/04_all_gentoo-apache-tools.patch index 3cb7113..85ea505 100644 --- a/2.2/patches/04_all_gentoo-apache-tools.patch +++ b/2.2/patches/04_all_gentoo-apache-tools.patch @@ -1,18 +1,56 @@ +--- + Makefile.in | 5 ++- + support/Makefile.in | 72 ---------------------------------------------------- + 2 files changed, 3 insertions(+), 74 deletions(-) + +--- a/Makefile.in ++++ b/Makefile.in +@@ -204,8 +204,9 @@ install-man: + @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 ++ @cp -p $(top_srcdir)/docs/man/dbmmanage.1 $(DESTDIR)$(mandir)/man1 ++ @cp -p $(top_srcdir)/docs/man/apxs.8 $(DESTDIR)$(mandir)/man8 ++ @cp -p $(top_srcdir)/docs/man/httpd.8 $(DESTDIR)$(mandir)/man8 + @if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \ + $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \ + else \ --- a/support/Makefile.in +++ b/support/Makefile.in -@@ -3,7 +3,7 @@ DISTCLEAN_TARGETS = apxs apachectl dbmma - - CLEAN_TARGETS = suexec - +@@ -1,72 +0,0 @@ +-DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \ +- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std +- +-CLEAN_TARGETS = suexec +- -PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm htcacheclean httxt2dbm -+PROGRAMS = rotatelogs logresolve checkgid htcacheclean httxt2dbm - TARGETS = $(PROGRAMS) - - PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) -@@ -29,14 +29,6 @@ install: - fi ; \ - fi - +-TARGETS = $(PROGRAMS) +- +-PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) +-PROGRAM_DEPENDENCIES = +- +-include $(top_builddir)/build/rules.mk +- +-install: +- @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 $(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) - $(LINK) $(htpasswd_LTFLAGS) $(htpasswd_OBJECTS) $(PROGRAM_LDADD) @@ -21,13 +59,14 @@ -htdigest: $(htdigest_OBJECTS) - $(LINK) $(htdigest_LTFLAGS) $(htdigest_OBJECTS) $(PROGRAM_LDADD) - - rotatelogs_OBJECTS = rotatelogs.lo - rotatelogs: $(rotatelogs_OBJECTS) - $(LINK) $(rotatelogs_LTFLAGS) $(rotatelogs_OBJECTS) $(PROGRAM_LDADD) -@@ -45,15 +37,6 @@ logresolve_OBJECTS = logresolve.lo - logresolve: $(logresolve_OBJECTS) - $(LINK) $(logresolve_LTFLAGS) $(logresolve_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) @@ -37,11 +76,19 @@ -ab: $(ab_OBJECTS) - $(LINK) $(ab_LTFLAGS) $(ab_OBJECTS) $(ab_LDADD) - - checkgid_OBJECTS = checkgid.lo - checkgid: $(checkgid_OBJECTS) - $(LINK) $(checkgid_LTFLAGS) $(checkgid_OBJECTS) $(PROGRAM_LDADD) -@@ -69,4 +52,3 @@ htcacheclean: $(htcacheclean_OBJECTS) - httxt2dbm_OBJECTS = httxt2dbm.lo - httxt2dbm: $(httxt2dbm_OBJECTS) - $(LINK) $(httxt2dbm_LTFLAGS) $(httxt2dbm_OBJECTS) $(PROGRAM_LDADD) +-checkgid_OBJECTS = checkgid.lo +-checkgid: $(checkgid_OBJECTS) +- $(LINK) $(checkgid_LTFLAGS) $(checkgid_OBJECTS) $(PROGRAM_LDADD) +- +-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) - |