diff options
| author |   Lars Wendler <polynomial-c@gentoo.org> | 2018-03-26 19:43:34 +0200 |
|---|---|---|
| committer | Lars Wendler <polynomial-c@gentoo.org> | 2018-03-26 19:47:05 +0200 |
| commit | 0d1ae7b4a1f347231f7d1b04626c4ee5c2c68ed4 (patch) | |
| tree | 156d508aca0f7fb5a0669ca3d542d42ce1b88b24 /app-admin/apache-tools/files | |
| parent | apache-2.eclass: Partially revert last change. (diff) | |
| download | gentoo-0d1ae7b4a1f347231f7d1b04626c4ee5c2c68ed4.tar.gz gentoo-0d1ae7b4a1f347231f7d1b04626c4ee5c2c68ed4.tar.bz2 gentoo-0d1ae7b4a1f347231f7d1b04626c4ee5c2c68ed4.zip | |
Revert "app-admin/apache-tools: Removed depreacated 2.2 version."
This reverts commit a5357cd65f35ed983d0f00d3cee198016528ef8a.
Diffstat (limited to 'app-admin/apache-tools/files')
| -rw-r--r-- | app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch new file mode 100644 index 000000000000..7bc39527790c --- /dev/null +++ b/app-admin/apache-tools/files/apache-tools-2.2.20-Makefile.patch @@ -0,0 +1,41 @@ +=== modified file 'support/Makefile.in' +--- a/support/Makefile.in ++++ b/support/Makefile.in +@@ -1,9 +1,10 @@ + DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \ +- logresolve.pl phf_abuse_log.cgi split-logfile envvars-std ++ logresolve.pl phf_abuse_log.cgi split-logfile + + CLEAN_TARGETS = suexec + +-PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT) ++PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm \ ++ $(NONPORTABLE_SUPPORT) log_server_status split-logfile dbmmanage + TARGETS = $(PROGRAMS) + + PROGRAM_LDADD = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS) +@@ -12,22 +13,13 @@ + 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 \ ++ @for i in $(PROGRAMS) ; 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) + |