httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r822734 - /httpd/mod_fcgid/trunk/Makefile.apxs
Date Wed, 07 Oct 2009 13:37:10 GMT
Author: trawick
Date: Wed Oct  7 13:37:09 2009
New Revision: 822734

URL: http://svn.apache.org/viewvc?rev=822734&view=rev
Log:
fix syntax error in make install

as was intended previously, errors modifying conf files are not fatal,
as seen in the following example:

$ make install
...
sh[3]: /export/home/trawick/inst/22/conf/original/httpd.conf.new: cannot create [Permission
denied]
Installing online manual
$ echo $?
0

Modified:
    httpd/mod_fcgid/trunk/Makefile.apxs

Modified: httpd/mod_fcgid/trunk/Makefile.apxs
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/Makefile.apxs?rev=822734&r1=822733&r2=822734&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/Makefile.apxs (original)
+++ httpd/mod_fcgid/trunk/Makefile.apxs Wed Oct  7 13:37:09 2009
@@ -42,14 +42,15 @@
 	@$(MKINSTALLDIRS) $(DESTDIR)$(exp_sysconfdir) \
 			  $(DESTDIR)$(exp_sysconfdir)/original
 	for i in $(DESTDIR)$(httpd_conffile) $(DESTDIR)$(httpd_origconffile); do \
-	    if test -f $$i; then (
-		awk -f $(fcgid_srcdir)/build/addloadexample.awk \
+	    if test -f $$i; then \
+		(awk -f $(fcgid_srcdir)/build/addloadexample.awk \
 		    -v MODULE=fcgid -v DSO=.so -v LIBPATH=$(rel_libexecdir) \
 		    -v EXAMPLECONF=$(rel_sysconfdir)/extra/httpd-fcgid.conf \
 		    $$i > $$i.new && \
-		mv $$i $$i.bak && mv $$i.new $$i \
-	) \
-	fi;
+		 mv $$i $$i.bak && mv $$i.new $$i \
+	        ) || true; \
+	    fi; \
+	done
 
 install-conf-unused:
 	@$(MKINSTALLDIRS) $(DESTDIR)$(exp_sysconfdir)/extra \



Mime
View raw message