Archives
Archives
| From: | "Mike Frysinger (vapier)" <vapier@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in app-admin/apache-tools/files: apache-tools-2.4.7-Makefile.patch |
| Date: | Fri, 31 Jan 2014 08:19:56 |
| Message-Id: | 20140131081952.A5A342004C@flycatcher.gentoo.org |
| 1 | vapier 14/01/31 08:19:52 |
| 2 | |
| 3 | Added: apache-tools-2.4.7-Makefile.patch |
| 4 | Log: |
| 5 | Fix src_install errors and install of dbmanage helper #459446 by Thomas Stein. |
| 6 | |
| 7 | (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key D2E96200) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/apache-tools/files/apache-tools-2.4.7-Makefile.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: apache-tools-2.4.7-Makefile.patch |
| 16 | =================================================================== |
| 17 | https://bugs.gentoo.org/459446 |
| 18 | |
| 19 | https://raw.github.com/archlinuxcn/repo/master/apache-tools/apache-tools-Makefile.patch |
| 20 | |
| 21 | --- a/support/Makefile.in |
| 22 | +++ b/support/Makefile.in |
| 23 | @@ -1,9 +1,9 @@ |
| 24 | DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \ |
| 25 | - logresolve.pl phf_abuse_log.cgi split-logfile envvars-std |
| 26 | + logresolve.pl phf_abuse_log.cgi split-logfile |
| 27 | |
| 28 | CLEAN_TARGETS = suexec |
| 29 | |
| 30 | -bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm |
| 31 | +bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm dbmmanage |
| 32 | sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT) |
| 33 | TARGETS = $(bin_PROGRAMS) $(sbin_PROGRAMS) |
| 34 | |
| 35 | @@ -15,26 +15,18 @@ |
| 36 | install: |
| 37 | @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir) |
| 38 | @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir) |
| 39 | - @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir) |
| 40 | - @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir) |
| 41 | - @for i in apxs dbmmanage; do \ |
| 42 | + @for i in $(bin_PROGRAMS); do \ |
| 43 | if test -f "$(builddir)/$$i"; then \ |
| 44 | cp -p $$i $(DESTDIR)$(bindir); \ |
| 45 | chmod 755 $(DESTDIR)$(bindir)/$$i; \ |
| 46 | fi ; \ |
| 47 | done |
| 48 | - @for i in apachectl; do \ |
| 49 | + @for i in $(sbin_PROGRAMS); do \ |
| 50 | if test -f "$(builddir)/$$i"; then \ |
| 51 | cp -p $$i $(DESTDIR)$(sbindir); \ |
| 52 | chmod 755 $(DESTDIR)$(sbindir)/$$i; \ |
| 53 | fi ; \ |
| 54 | done |
| 55 | - @if test -f "$(builddir)/envvars-std"; then \ |
| 56 | - cp -p envvars-std $(DESTDIR)$(sbindir); \ |
| 57 | - if test ! -f $(DESTDIR)$(sbindir)/envvars; then \ |
| 58 | - cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \ |
| 59 | - fi ; \ |
| 60 | - fi |
| 61 | |
| 62 | htpasswd.lo: passwd_common.h |
| 63 | passwd_common.lo: passwd_common.h |