Author: jan
Date: Sun Jun 1 13:23:54 2008
New Revision: 662283
URL: http://svn.apache.org/viewvc?rev=662283&view=rev
Log:
revert BSD sed hackery
background: sed -r is only available in GNU sed
this branch only works on GNU systems currently :/
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=662283&r1=662282&r2=662283&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/Makefile.am Sun Jun 1 13:23:54 2008
@@ -40,7 +40,7 @@
mkdir default; \
fi \
fi
- sed -E -e "s|%configure_input%|$@. Generated from $< by configure.|" \
+ sed -r -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-e "s|%pkgconfdir%|@pkgconfdir@|g" \
-e "s|%sysconfdir%|@sysconfdir@|" \
-e "s|%localstatedir%|@localstatedir@|" \
@@ -55,7 +55,7 @@
mkdir init; \
fi \
fi
- sed -E -e "s|%configure_input%|$@. Generated from $< by configure.|" \
+ sed -r -e "s|%configure_input%|$@. Generated from $< by configure.|" \
-e "s|%bindir%|@bindir@|" \
-e "s|%sysconfdir%|@sysconfdir@|" \
-e "s|%erlangbindir%|@erlangbindir@|" \
@@ -74,7 +74,7 @@
mkdir launchd; \
fi \
fi
- sed -E -e "s|%configure_input%|$@. Generated from $< by configure.|" \
+ 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" \
Modified: incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am?rev=662283&r1=662282&r2=662283&view=diff
==============================================================================
--- incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am (original)
+++ incubator/couchdb/branches/runtimeconfig/etc/couchdb/Makefile.am Sun Jun 1 13:23:54 2008
@@ -22,7 +22,7 @@
couchprivlibdir = $(erlanglibdir)/couch-$(version)/priv/lib
couch.ini: couch.ini.tpl
- sed -E -e "s|%bindir%|@bindir@|g" \
+ sed -r -e "s|%bindir%|@bindir@|g" \
-e "s|%pkgconfdir%|@pkgconfdir@|g" \
-e "s|%pkgdatadir%|@pkgdatadir@|g" \
-e "s|%pkgstatelibdir%|@pkgstatelibdir@|g" \
|