apache-tools/apache-tools-Makefile.patch

   1 --- a/support/Makefile.in
   2 +++ b/support/Makefile.in
   3 @@ -1,9 +1,10 @@
   4  DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
   5 -       logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
   6 +       logresolve.pl phf_abuse_log.cgi split-logfile
   7
   8  CLEAN_TARGETS = suexec
   9
  10 -PROGRAMS = htpasswd htdigest rotatelogs logresolve ab htdbm htcacheclean httxt2dbm $(NONPORTABLE_SUPPORT)
  11 +PROGRAMS = htpasswd htdigest rotatelogs logresolve ab checkgid htdbm \
  12 +       htcacheclean httxt2dbm log_server_status split-logfile dbmmanage
  13  TARGETS  = $(PROGRAMS)
  14
  15  PROGRAM_LDADD        = $(UTIL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS) $(AP_LIBS)
  16 @@ -12,22 +13,13 @@ PROGRAM_DEPENDENCIES =
  17  include $(top_builddir)/build/rules.mk
  18
  19  install:
  20 -       @test -d $(DESTDIR)$(bindir) || $(MKINSTALLDIRS) $(DESTDIR)$(bindir)
  21         @test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir)
  22 -       @test -d $(DESTDIR)$(libexecdir) || $(MKINSTALLDIRS) $(DESTDIR)$(libexecdir)
  23 -       @cp -p $(top_builddir)/server/httpd.exp $(DESTDIR)$(libexecdir)
  24 -       @for i in apxs apachectl dbmmanage; do \
  25 +       @for i in $(PROGRAMS) ; do \
  26             if test -f "$(builddir)/$$i"; then \
  27                 cp -p $$i $(DESTDIR)$(sbindir); \
  28                 chmod 755 $(DESTDIR)$(sbindir)/$$i; \
  29             fi ; \
  30         done
  31 -       @if test -f "$(builddir)/envvars-std"; then \
  32 -           cp -p envvars-std $(DESTDIR)$(sbindir); \
  33 -           if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
  34 -               cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
  35 -           fi ; \
  36 -       fi
  37
  38  htpasswd_OBJECTS = htpasswd.lo
  39  htpasswd: $(htpasswd_OBJECTS)