couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nsla...@apache.org
Subject svn commit: r663127 - in /incubator/couchdb/branches/runtimeconfig/etc: Makefile.am couchdb/Makefile.am
Date Wed, 04 Jun 2008 14:39:12 GMT
Author: nslater
Date: Wed Jun  4 07:39:12 2008
New Revision: 663127

URL: http://svn.apache.org/viewvc?rev=663127&view=rev
Log:
removed problematic option to sed

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=663127&r1=663126&r2=663127&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/Makefile.am Wed Jun  4 07:39:12 2008
@@ -46,10 +46,10 @@
 	        mkdir default; \
 	    fi \
 	fi
-	sed -E -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-	       -e "s|%pkgconfdir%|$(abs_pkgconfdir)|g" \
-	       -e "s|%sysconfdir%|$(abs_sysconfdir)|" \
-	       -e "s|%localstatedir%|$(abs_localstatedir)|" \
+	sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
+	    -e "s|%pkgconfdir%|$(abs_pkgconfdir)|g" \
+	    -e "s|%sysconfdir%|$(abs_sysconfdir)|" \
+	    -e "s|%localstatedir%|$(abs_localstatedir)|" \
 	< $< > $@
 
 init/couchdb: init/couchdb.tpl
@@ -60,11 +60,11 @@
 	        mkdir init; \
 	    fi \
 	fi
-	sed -E -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-	       -e "s|%bindir%|$(abs_bindir)|" \
-	       -e "s|%sysconfdir%|$(abs_sysconfdir)|" \
-	       -e "s|%erlangbindir%|$(abs_erlangbindir)|" \
-	       -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
+	sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
+	    -e "s|%bindir%|$(abs_bindir)|" \
+	    -e "s|%sysconfdir%|$(abs_sysconfdir)|" \
+	    -e "s|%erlangbindir%|$(abs_erlangbindir)|" \
+	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
 	< $< > $@
 
 logrotate.d/couchdb: logrotate.d/couchdb.tpl
@@ -78,9 +78,9 @@
 	        mkdir launchd; \
 	    fi \
 	fi
-	sed -E -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-	       -e "s|%bindir%|$(abs_bindir)|" \
-	       -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
+	sed -e "s|%configure_input%|$@. Generated from $< by configure.|" \
+	    -e "s|%bindir%|$(abs_bindir)|" \
+	    -e "s|%couchdb_command_name%|$(couchdb_command_name)|" \
 	< $< > $@
 
 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=663127&r1=663126&r2=663127&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am Wed Jun  4 07:39:12 2008
@@ -28,11 +28,11 @@
 abs_pkgstatelogdir = $(abspath $(pkgstatelogdir))
 
 couch.ini: couch.ini.tpl
-	sed -E -e "s|%bindir%|$(abs_bindir)|g" \
-	       -e "s|%pkgconfdir%|$(abs_pkgconfdir)|g" \
-	       -e "s|%pkgdatadir%|$(abs_pkgdatadir)|g" \
-	       -e "s|%pkgstatelibdir%|$(abs_pkgstatelibdir)|g" \
-	       -e "s|%pkgstatelogdir%|$(abs_pkgstatelogdir)|g" \
-	       -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
-	       -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
+	sed -e "s|%bindir%|$(abs_bindir)|g" \
+	    -e "s|%pkgconfdir%|$(abs_pkgconfdir)|g" \
+	    -e "s|%pkgdatadir%|$(abs_pkgdatadir)|g" \
+	    -e "s|%pkgstatelibdir%|$(abs_pkgstatelibdir)|g" \
+	    -e "s|%pkgstatelogdir%|$(abs_pkgstatelogdir)|g" \
+	    -e "s|%couchprivlibdir%|$(couchprivlibdir)|g" \
+	    -e "s|%couchjs_command_name%|$(couchjs_command_name)|g" \
 	< $< > $@



Mime
View raw message