httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r819647 - /httpd/mod_ftp/trunk/Makefile.apxs
Date Mon, 28 Sep 2009 17:09:54 GMT
Author: wrowe
Date: Mon Sep 28 17:09:53 2009
New Revision: 819647

URL: http://svn.apache.org/viewvc?rev=819647&view=rev
Log:
Correct Makefile.apxs installation targets to account for DESTDIR, per
the mod_fcgid patch offered by Paul Howarth <paul city-fan.org>

Modified:
    httpd/mod_ftp/trunk/Makefile.apxs

Modified: httpd/mod_ftp/trunk/Makefile.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_ftp/trunk/Makefile.apxs?rev=819647&r1=819646&r2=819647&view=diff
==============================================================================
--- httpd/mod_ftp/trunk/Makefile.apxs (original)
+++ httpd/mod_ftp/trunk/Makefile.apxs Mon Sep 28 17:09:53 2009
@@ -67,9 +67,9 @@
 	@awk -f $(ftp_srcdir)/build/addloadexample.awk \
 		-v MODULE=ftp -v DSO=.so -v LIBPATH=$(rel_libexecdir) \
 		-v EXAMPLECONF=$(rel_sysconfdir)/extra/ftpd.conf \
-		$(httpd_conffile) > $(httpd_conffile).new && \
-	  ( mv $(httpd_conffile) $(httpd_conffile).bak && \
-	    mv $(httpd_conffile).new $(httpd_conffile) );
+		$(DESTDIR)$(httpd_conffile) > $(DESTDIR)$(httpd_conffile).new && \
+	  ( mv $(DESTDIR)$(httpd_conffile) $(DESTDIR)$(httpd_conffile).bak && \
+	    mv $(DESTDIR)$(httpd_conffile).new $(DESTDIR)$(httpd_conffile) );
 
 svnroot=http://svn.apache.org/repos/asf/httpd
 manualdir=$(ftp_srcdir)/docs/manual
@@ -99,40 +99,40 @@
 ftpdocs-srcdir = $(ftp_srcdir)/docs/ftproot
 
 install-ftpdocs:
-	@if test -d $(exp_ftpdocsdir); then \
+	@if test -d $(DESTDIR)$(exp_ftpdocsdir); then \
 	  echo "Preserving existing FTP documents"; \
 	else \
 	  echo "Installing FTP documents"; \
-	  $(MKINSTALLDIRS) $(exp_ftpdocsdir) ; \
-	  if test -d $(ftpdocs-srcdir) && test "x$(RSYNC)" != "x" \
+	  $(MKINSTALLDIRS) $(DESTDIR)$(exp_ftpdocsdir) ; \
+	  if test -d $(DESTDIR)$(ftpdocs-srcdir) && test "x$(RSYNC)" != "x" \
 	    && test -x "$(RSYNC)" ; then \
 		$(RSYNC) --exclude .svn -rlpt --numeric-ids $(ftpdocs-srcdir)/ \
-			$(exp_ftpdocsdir)/; \
+			$(DESTDIR)$(exp_ftpdocsdir)/; \
 	  else \
 		test -d $(ftpdocs-srcdir) && (cd $(ftpdocs-srcdir) \
-		  && cp -rp * $(exp_ftpdocsdir)) ; \
-		cd $(exp_ftpdocsdir) && find . -name ".svn" -type d -print \
+		  && cp -rp * $(DESTDIR)$(exp_ftpdocsdir)) ; \
+		cd $(DESTDIR)$(exp_ftpdocsdir) && find . -name ".svn" -type d -print \
 		  | xargs rm -rf 2>/dev/null || true; \
 	  fi; \
 	fi
 
 install-manual:
 	@echo Installing online manual
-	@test -d $(exp_manualdir) \
-          || $(MKINSTALLDIRS) $(exp_manualdir)
+	@test -d $(DESTDIR)$(exp_manualdir) \
+          || $(MKINSTALLDIRS) $(DESTDIR)$(exp_manualdir)
 	@if test "x$(RSYNC)" != "x" && test -x $(RSYNC) ; then \
 	  $(RSYNC) --exclude .svn -rlpt --numeric-ids \
-		$(ftp_srcdir)/docs/manual/ $(exp_manualdir)/; \
+		$(ftp_srcdir)/docs/manual/ $(DESTDIR)$(exp_manualdir)/; \
 	else \
-	  cp -rp $(ftp_srcdir)/docs/manual/* $(exp_manualdir)/ && \
-	  find $(exp_manualdir) -name ".svn" -type d -print \
+	  cp -rp $(ftp_srcdir)/docs/manual/* $(DESTDIR)$(exp_manualdir)/ && \
+	  find $(DESTDIR)$(exp_manualdir) -name ".svn" -type d -print \
 	    | xargs rm -rf 2>/dev/null || true; \
 	fi
 
 install-include:
 	@echo Installing header files
-	@$(MKINSTALLDIRS) $(exp_includedir) && \
-	  cp $(ftp_srcdir)/include/mod_ftp.h $(exp_includedir)/ && \
-	  chmod 0644 $(exp_includedir)/mod_ftp.h
+	@$(MKINSTALLDIRS) $(DESTDIR)$(exp_includedir) && \
+	  cp $(ftp_srcdir)/include/mod_ftp.h $(DESTDIR)$(exp_includedir)/ && \
+	  chmod 0644 $(DESTDIR)$(exp_includedir)/mod_ftp.h
 
 .PHONY: generate-dox generate-docs



Mime
View raw message