couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r659703 - in /incubator/couchdb/branches/runtimeconfig/etc: Makefile.am couchdb/Makefile.am
Date Fri, 23 May 2008 23:03:57 GMT
Author: nslater
Date: Fri May 23 16:03:56 2008
New Revision: 659703

URL: http://svn.apache.org/viewvc?rev=659703&view=rev
Log:
normalise filenames in configuration files

Modified:
    incubator/couchdb/branches/runtimeconfig/etc/Makefile.am
    incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am

Modified: incubator/couchdb/branches/runtimeconfig/etc/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/etc/Makefile.am?rev=659703&r1=659702&r2=659703&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/Makefile.am Fri May 23 16:03:56 2008
@@ -40,10 +40,11 @@
 	        mkdir default; \
 	    fi \
 	fi
-	sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-	    -e "s|%pkgconfdir%|@pkgconfdir@|g" \
-	    -e "s|%sysconfdir%|@sysconfdir@|" \
-	    -e "s|%localstatedir%|@localstatedir@|" \
+	sed -r -e "s|%configure_input%|$@. Generated from $< by configure.|" \
+	       -e "s|%pkgconfdir%|@pkgconfdir@|g" \
+	       -e "s|%sysconfdir%|@sysconfdir@|" \
+	       -e "s|%localstatedir%|@localstatedir@|" \
+	       -e "s|([^:])/+|\1/|g" \
 	< $< > $@
 
 init/couchdb: init/couchdb.tpl
@@ -54,11 +55,12 @@
 	        mkdir init; \
 	    fi \
 	fi
-	sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-	    -e "s|%bindir%|@bindir@|" \
-	    -e "s|%sysconfdir%|@sysconfdir@|" \
-	    -e "s|%erlangbindir%|@erlangbindir@|" \
-	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
+	sed -r -e "s|%configure_input%|$@. Generated from $< by configure.|" \
+	       -e "s|%bindir%|@bindir@|" \
+	       -e "s|%sysconfdir%|@sysconfdir@|" \
+	       -e "s|%erlangbindir%|@erlangbindir@|" \
+	       -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
+	       -e "s|([^:])/+|\1/|g" \
 	< $< > $@
 
 logrotate.d/couchdb: logrotate.d/couchdb.tpl
@@ -72,9 +74,10 @@
 	        mkdir launchd; \
 	    fi \
 	fi
-	sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-	    -e "s|%bindir%|@bindir@|" \
-	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
+	sed -r -e "s|%configure_input%|$@. Generated from $< by configure.|" \
+	       -e "s|%bindir%|@bindir@|" \
+	       -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
+	       -e "s|([^:])/+|\1/|g" \
 	< $< > $@
 
 install-data-hook:

Modified: incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am?rev=659703&r1=659702&r2=659703&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am Fri May 23 16:03:56 2008
@@ -22,11 +22,12 @@
 couchprivlibdir = $(erlanglibdir)/couch-$(version)/priv/lib
 
 couch.ini: couch.ini.tpl
-	sed -e "s|%bindir%|@bindir@|g" \
-	    -e "s|%pkgconfdir%|@pkgconfdir@|g" \
-	    -e "s|%pkgdatadir%|@pkgdatadir@|g" \
-	    -e "s|%pkgstatelibdir%|@pkgstatelibdir@|g" \
-	    -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \
-	    -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
-	    -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
+	sed -r -e "s|%bindir%|@bindir@|g" \
+	       -e "s|%pkgconfdir%|@pkgconfdir@|g" \
+	       -e "s|%pkgdatadir%|@pkgdatadir@|g" \
+	       -e "s|%pkgstatelibdir%|@pkgstatelibdir@|g" \
+	       -e "s|%pkgstatelogdir%|@pkgstatelogdir@|g" \
+	       -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
+	       -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
+	       -e "s|([^:])/+|\1/|g" \
 	< $< > $@



Mime
View raw message