$NetBSD: patch-aa,v 1.3 2018/09/24 07:37:47 adam Exp $

--- Makefile.in.orig	2018-08-08 11:48:15.000000000 +0000
+++ Makefile.in
@@ -4,7 +4,7 @@ CLEAN_SUBDIRS = test
 
 PROGRAM_NAME         = $(progname)
 PROGRAM_SOURCES      = modules.c
-PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS)
+PROGRAM_LDADD        = buildmark.o $(HTTPD_LDFLAGS) $(DL_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(PCRE_LIBS) $(EXTRA_LIBS) $(AP_LIBS) $(LIBS) $(DL_LIBS)
 PROGRAM_PRELINK      = $(COMPILE) -c $(top_srcdir)/server/buildmark.c
 PROGRAM_DEPENDENCIES = \
   server/libmain.la \
@@ -14,7 +14,7 @@ PROGRAM_DEPENDENCIES = \
 
 sbin_PROGRAMS   = $(PROGRAM_NAME)
 TARGETS         = $(sbin_PROGRAMS) $(shared_build) $(other_targets)
-INSTALL_TARGETS = install-conf install-htdocs install-error install-icons \
+INSTALL_TARGETS = install-htdocs install-error install-icons \
 	install-other install-cgi install-include install-suexec install-build \
 	install-man
 
@@ -31,8 +31,8 @@ include $(top_srcdir)/build/program.mk
 
 install-conf:
 	@echo Installing configuration files
-	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/extra
-	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/original/extra
+	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)
+	@$(MKINSTALLDIRS) $(DESTDIR)$(sysconfdir)/extra
 	@cd $(top_srcdir)/docs/conf; \
 	for i in mime.types magic; do \
 	    if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
@@ -108,7 +108,8 @@ install-conf:
 	    				-e 's#@@SSLPort@@#$(SSLPORT)#g' \
 	    				< $$i; \
 	    		fi \
-	    	) > $(DESTDIR)$(sysconfdir)/original/$$i; \
+	    	) > $(DESTDIR)$(sysconfdir)/$$i; \
+		if false; then \
 	    	chmod 0644 $(DESTDIR)$(sysconfdir)/original/$$i; \
 	    	file=$$i; \
 	    	if [ "$$i" = "httpd.conf" ]; then \
@@ -118,13 +119,16 @@ install-conf:
 	    		$(INSTALL_DATA) $(DESTDIR)$(sysconfdir)/original/$$i $(DESTDIR)$(sysconfdir)/$$file; \
 	    	fi; \
 	    	fi; \
+		fi; \
 	    done ; \
 	done ; \
 	if test -f "$(builddir)/envvars-std"; then \
 	    cp -p envvars-std $(DESTDIR)$(sbindir); \
+	    if false; then \
 	    if test ! -f $(DESTDIR)$(sbindir)/envvars; then \
 	        cp -p envvars-std $(DESTDIR)$(sbindir)/envvars ; \
 	    fi ; \
+	    fi ; \
 	fi
 
 # Create a sanitized config_vars.mk
@@ -142,7 +146,7 @@ install-build: build/config_vars.out
 		  $(top_srcdir)/build/instdso.sh; do \
 	 $(INSTALL_PROGRAM) $$f $(DESTDIR)$(installbuilddir); \
 	done
-	@$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk
+	#@$(INSTALL_DATA) build/config_vars.out $(DESTDIR)$(installbuilddir)/config_vars.mk
 	@rm build/config_vars.out
 
 htdocs-srcdir = $(top_srcdir)/docs/docroot
@@ -167,48 +171,28 @@ dox:
 	doxygen $(top_srcdir)/docs/doxygen.conf
 
 install-htdocs:
-	-@if [ -d $(DESTDIR)$(htdocsdir) ]; then \
-           echo "[PRESERVING EXISTING HTDOCS SUBDIR: $(DESTDIR)$(htdocsdir)]"; \
-        else \
 	    echo Installing HTML documents ; \
-	    $(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
-	    if test -d $(htdocs-srcdir) && test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
-		$(RSYNC) --exclude .svn -rlpt --numeric-ids $(htdocs-srcdir)/ $(DESTDIR)$(htdocsdir)/; \
-	    else \
-		test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(DESTDIR)$(htdocsdir)) ; \
-		cd $(DESTDIR)$(htdocsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
-	    fi; \
-	fi
+		$(MKINSTALLDIRS) $(DESTDIR)$(htdocsdir) ; \
+		test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && \
+		@PAX@ -rwppm . $(DESTDIR)$(htdocsdir))
 
 install-error:
-	-@if [ -d $(DESTDIR)$(errordir) ]; then \
-           echo "[PRESERVING EXISTING ERROR SUBDIR: $(DESTDIR)$(errordir)]"; \
-        else \
 	    echo Installing error documents ; \
 	    $(MKINSTALLDIRS) $(DESTDIR)$(errordir) ; \
-	    cd $(top_srcdir)/docs/error && cp -rp * $(DESTDIR)$(errordir) ; \
-	    test "x$(errordir)" != "x" && cd $(DESTDIR)$(errordir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
-	fi
+	cd $(top_srcdir)/docs/error && \
+		@PAX@ -rwppm . $(DESTDIR)$(errordir)
 
 install-icons:
-	-@if [ -d $(DESTDIR)$(iconsdir) ]; then \
-           echo "[PRESERVING EXISTING ICONS SUBDIR: $(DESTDIR)$(iconsdir)]"; \
-        else \
 	    echo Installing icons ; \
 	    $(MKINSTALLDIRS) $(DESTDIR)$(iconsdir) ; \
-	    cd $(top_srcdir)/docs/icons && cp -rp * $(DESTDIR)$(iconsdir) ; \
-	    test "x$(iconsdir)" != "x" && cd $(DESTDIR)$(iconsdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
-	fi
+	cd $(top_srcdir)/docs/icons && \
+		@PAX@ -rwppm . $(DESTDIR)$(iconsdir)
 
 install-cgi:
-	-@if [ -d $(DESTDIR)$(cgidir) ];then \
-	    echo "[PRESERVING EXISTING CGI SUBDIR: $(DESTDIR)$(cgidir)]"; \
-	else \
 	   echo Installing CGIs ; \
 	   $(MKINSTALLDIRS) $(DESTDIR)$(cgidir) ; \
-	   cd $(top_srcdir)/docs/cgi-examples && cp -rp * $(DESTDIR)$(cgidir) ; \
-	   test "x$(cgidir)" != "x" && cd $(DESTDIR)$(cgidir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
-	fi
+	cd $(top_srcdir)/docs/cgi-examples && \
+		@PAX@ -rwppm . $(DESTDIR)$(cgidir)
 
 install-other:
 	@test -d $(DESTDIR)$(logfiledir) || $(MKINSTALLDIRS) $(DESTDIR)$(logfiledir)
@@ -260,14 +244,10 @@ 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
-	@if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
-	  $(RSYNC) --exclude .svn -rlpt --numeric-ids $(top_srcdir)/docs/manual/ $(DESTDIR)$(manualdir)/; \
-	else \
-	  cd $(top_srcdir)/docs/manual && cp -rp * $(DESTDIR)$(manualdir); \
-	  cd $(DESTDIR)$(manualdir) && find . -name ".svn" -type d -print | xargs rm -rf 2>/dev/null || true; \
-	fi
+	$(BSD_INSTALL_MAN) $(top_srcdir)/docs/man/*.1 $(DESTDIR)$(mandir)/man1
+	$(BSD_INSTALL_MAN) $(top_srcdir)/docs/man/*.8 $(DESTDIR)$(mandir)/man8
+	cd $(top_srcdir)/docs/manual && \
+	@PAX@ -rwppm . $(DESTDIR)$(manualdir)
 
 install-suexec: install-suexec-$(INSTALL_SUEXEC)