Description: add suexec-custom to the build system
Forwarded: not-needed
Author: Stefan Fritsch <sf@debian.org>
Last-Update: 2012-02-25
--- a/Makefile.in
+++ b/Makefile.in
@@ -272,23 +272,26 @@
 install-suexec: install-suexec-$(INSTALL_SUEXEC)
 
 install-suexec-binary:
-	@if test -f $(builddir)/support/suexec; then \
-            test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir); \
-            $(INSTALL_PROGRAM) $(top_builddir)/support/suexec $(DESTDIR)$(sbindir); \
+	@if test -f $(builddir)/support/suexec-pristine && test -f $(builddir)/support/suexec-custom; then \
+	    test -d $(DESTDIR)$(sbindir) || $(MKINSTALLDIRS) $(DESTDIR)$(sbindir); \
+	    $(INSTALL_PROGRAM) $(top_builddir)/support/suexec-pristine $(DESTDIR)$(sbindir); \
+	    $(INSTALL_PROGRAM) $(top_builddir)/support/suexec-custom $(DESTDIR)$(sbindir); \
 	fi
 
 install-suexec-setuid: install-suexec-binary
-	@if test -f $(builddir)/support/suexec; then \
-	    chmod 4755 $(DESTDIR)$(sbindir)/suexec; \
+	@if test -f $(builddir)/support/suexec-pristine && test -f $(builddir)/support/suexec-custom; then \
+	    chmod 4755 $(DESTDIR)$(sbindir)/suexec-pristine; \
+	    chmod 4755 $(DESTDIR)$(sbindir)/suexec-custom; \
 	fi
 
 install-suexec-caps: install-suexec-binary
-	@if test -f $(builddir)/support/suexec; then \
-            setcap 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec; \
+	@if test -f $(builddir)/support/suexec-pristine && test -f $(builddir)/support/suexec-custom; then \
+	    setcap 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec-pristine; \
+	    setcap 'cap_setuid,cap_setgid+pe' $(DESTDIR)$(sbindir)/suexec-custom; \
 	fi
 
 suexec:
-	cd support && $(MAKE) suexec
+	cd support && $(MAKE) suexec-pristine suexec-custom
 
 x-local-distclean:
 	@rm -rf autom4te.cache
--- a/support/Makefile.in
+++ b/support/Makefile.in
@@ -1,7 +1,7 @@
 DISTCLEAN_TARGETS = apxs apachectl dbmmanage log_server_status \
 	logresolve.pl phf_abuse_log.cgi split-logfile envvars-std
 
-CLEAN_TARGETS = suexec
+CLEAN_TARGETS = suexec-pristine suexec-custom
 
 bin_PROGRAMS = htpasswd htdigest htdbm ab logresolve httxt2dbm
 sbin_PROGRAMS = htcacheclean rotatelogs $(NONPORTABLE_SUPPORT)
@@ -72,9 +72,13 @@
 checkgid: $(checkgid_OBJECTS)
 	$(LINK) $(checkgid_LTFLAGS) $(checkgid_OBJECTS) $(PROGRAM_LDADD)
 
-suexec_OBJECTS = suexec.lo
-suexec: $(suexec_OBJECTS)
-	$(LINK) $(suexec_OBJECTS)
+suexec-pristine_OBJECTS = suexec.lo
+suexec-pristine: $(suexec-pristine_OBJECTS)
+	$(LINK) $(suexec-pristine_OBJECTS)
+
+suexec-custom_OBJECTS = suexec-custom.lo
+suexec-custom: $(suexec-custom_OBJECTS)
+	$(LINK) $(suexec-custom_OBJECTS)
 
 htcacheclean_OBJECTS = htcacheclean.lo
 htcacheclean: $(htcacheclean_OBJECTS)
