r14706 - gnucash/trunk/src/bin - Replace : as sed's replacement command delimiter by # because on Windows, fully qualified filenames might contain the colon.

[Christian Stimming]

Author: cstim
Date: 2006-08-22 09:38:12 -0400 (Tue, 22 Aug 2006)
New Revision: 14706
Trac: http://svn.gnucash.org/trac/changeset/14706

Modified:
   gnucash/trunk/src/bin/Makefile.am
   gnucash/trunk/src/bin/overrides/Makefile.am
Log:
Replace : as sed's replacement command delimiter by # because on Windows, fully qualified filenames might contain the colon.

Modified: gnucash/trunk/src/bin/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/Makefile.am	2006-08-22 12:51:03 UTC (rev 14705)
+++ gnucash/trunk/src/bin/Makefile.am	2006-08-22 13:38:12 UTC (rev 14706)
@@ -31,14 +31,14 @@
 gnucash: gnucash.in ${top_builddir}/config.status Makefile
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
-	    -e 's:@-BIN_DIR-@:${bindir}:g' \
-	    -e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:g' \
-	    -e 's:@-G_WRAP_LIB_DIR-@:${G_WRAP_LIB_DIR}:g' \
-	    -e 's:@-GNC_GUILE_MODULE_DIR-@:${GNC_SHAREDIR}/guile-modules:g' \
-	    -e 's:@-GNC_SCM_INSTALL_DIR-@:${GNC_SCM_INSTALL_DIR}:g' \
-            -e 's:@-GNC_LIB_INSTALLDIR-@:${libdir}:' \
-            -e 's:@-GNC_PKGLIB_INSTALLDIR-@:${pkglibdir}:g' \
-	    -e 's:@-GNC_MODULE_DIR-@:${GNC_MODULE_DIR}:g'
+	    -e 's#@-BIN_DIR-@#${bindir}#g' \
+	    -e 's#@-G_WRAP_MODULE_DIR-@#${G_WRAP_MODULE_DIR}#g' \
+	    -e 's#@-G_WRAP_LIB_DIR-@#${G_WRAP_LIB_DIR}#g' \
+	    -e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
+	    -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
+            -e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
+            -e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
+	    -e 's#@-GNC_MODULE_DIR-@#${GNC_MODULE_DIR}#g'
 	mv $@.tmp $@
 	chmod u+x $@
 
@@ -47,23 +47,23 @@
 i18n.h: i18n.h.in ${top_builddir}/config.status Makefile
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
-            -e 's:@-PACKAGE-@:${PACKAGE}:g' \
-            -e 's:@-LOCALE_DIR-@:${LOCALE_DIR}:g'
+            -e 's#@-PACKAGE-@#${PACKAGE}#g' \
+            -e 's#@-LOCALE_DIR-@#${LOCALE_DIR}#g'
 	mv $@.tmp $@
 
 
 gnucash-valgrind: gnucash-valgrind.in ${top_builddir}/config.status Makefile
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
-	    -e 's:@-BIN_DIR-@:${bindir}:g' \
-	    -e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:g' \
-	    -e 's:@-G_WRAP_LIB_DIR-@:${G_WRAP_LIB_DIR}:g' \
-	    -e 's:@-GNC_GUILE_MODULE_DIR-@:${GNC_SHAREDIR}/guile-modules:g' \
-	    -e 's:@-GNC_SCM_INSTALL_DIR-@:${GNC_SCM_INSTALL_DIR}:g' \
-            -e 's:@-GNC_LIB_INSTALLDIR-@:${libdir}:' \
-            -e 's:@-GNC_PKGLIB_INSTALLDIR-@:${pkglibdir}:g' \
-	    -e 's:@-GNC_MODULE_DIR-@:${GNC_MODULE_DIR}:g' \
-	    -e "s:@-TOP_SRC_DIR-@:`pwd`/${top_srcdir}:g"
+	    -e 's#@-BIN_DIR-@#${bindir}#g' \
+	    -e 's#@-G_WRAP_MODULE_DIR-@#${G_WRAP_MODULE_DIR}#g' \
+	    -e 's#@-G_WRAP_LIB_DIR-@#${G_WRAP_LIB_DIR}#g' \
+	    -e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
+	    -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
+            -e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
+            -e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
+	    -e 's#@-GNC_MODULE_DIR-@#${GNC_MODULE_DIR}#g' \
+	    -e "s#@-TOP_SRC_DIR-@#`pwd`/${top_srcdir}#g"
 	mv $@.tmp $@
 	chmod u+x $@
 
@@ -108,6 +108,6 @@
 		${top_builddir}/config.status Makefile
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
-	    -e 's:@-GCONF_SCHEMA_FILE_DIR-@:${GCONF_SCHEMA_FILE_DIR}:g'
+	    -e 's#@-GCONF_SCHEMA_FILE_DIR-@#${GCONF_SCHEMA_FILE_DIR}#g'
 	mv $@.tmp $@
 	chmod +x $@

Modified: gnucash/trunk/src/bin/overrides/Makefile.am
===================================================================
--- gnucash/trunk/src/bin/overrides/Makefile.am	2006-08-22 12:51:03 UTC (rev 14705)
+++ gnucash/trunk/src/bin/overrides/Makefile.am	2006-08-22 13:38:12 UTC (rev 14706)
@@ -23,7 +23,7 @@
 guile: guile.in ${top_builddir}/config.status Makefile
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
-	    -e 's:@-GUILE-@:${GUILE}:'
+	    -e 's#@-GUILE-@#${GUILE}#'
 	mv $@.tmp $@
 	chmod u+x $@
 CLEANFILES = guile
@@ -31,14 +31,14 @@
 gnucash-env: gnucash-env.in ${top_builddir}/config.status Makefile
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
-	    -e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:g' \
-	    -e 's:@-G_WRAP_LIB_DIR-@:${G_WRAP_LIB_DIR}:g' \
-	    -e 's:@-GNC_GUILE_MODULE_DIR-@:${GNC_SHAREDIR}/guile-modules:g' \
-	    -e 's:@-GNC_SCM_INSTALL_DIR-@:${GNC_SCM_INSTALL_DIR}:g' \
-            -e 's:@-GNC_LIB_INSTALLDIR-@:${libdir}:' \
-            -e 's:@-GNC_PKGLIB_INSTALLDIR-@:${pkglibdir}:g' \
-	    -e 's:@-GNC_MODULE_DIR-@:${GNC_MODULE_DIR}:g' \
-            -e 's:@-GNC_SCRIPT_OVERRIDE_DIR-@:${gncoverridedir}:g'
+	    -e 's#@-G_WRAP_MODULE_DIR-@#${G_WRAP_MODULE_DIR}#g' \
+	    -e 's#@-G_WRAP_LIB_DIR-@#${G_WRAP_LIB_DIR}#g' \
+	    -e 's#@-GNC_GUILE_MODULE_DIR-@#${GNC_SHAREDIR}/guile-modules#g' \
+	    -e 's#@-GNC_SCM_INSTALL_DIR-@#${GNC_SCM_INSTALL_DIR}#g' \
+            -e 's#@-GNC_LIB_INSTALLDIR-@#${libdir}#' \
+            -e 's#@-GNC_PKGLIB_INSTALLDIR-@#${pkglibdir}#g' \
+	    -e 's#@-GNC_MODULE_DIR-@#${GNC_MODULE_DIR}#g' \
+            -e 's#@-GNC_SCRIPT_OVERRIDE_DIR-@#${gncoverridedir}#g'
 	mv $@.tmp $@
 	chmod u+x $@
 CLEANFILES += gnucash-env
@@ -46,11 +46,11 @@
 gnucash-build-env: gnucash-build-env.in ${top_builddir}/config.status Makefile
 	rm -f $@.tmp
 	sed < $< > $@.tmp \
-            -e 's:@-GNC_TEST_SRFI_LOAD_CMD-@:@GNC_TEST_SRFI_LOAD_CMD@:g' \
-	    -e 's:@-G_WRAP_MODULE_DIR-@:${G_WRAP_MODULE_DIR}:g' \
-	    -e 's:@-G_WRAP_LIB_DIR-@:${G_WRAP_LIB_DIR}:g' \
-            -e 's:@-GNC_BUILDDIR-@:${PWD}/${top_builddir}:g' \
-            -e 's:@-GNC_SRCDIR-@:${PWD}/${top_srcdir}:g'
+            -e 's#@-GNC_TEST_SRFI_LOAD_CMD-@#@GNC_TEST_SRFI_LOAD_CMD@#g' \
+	    -e 's#@-G_WRAP_MODULE_DIR-@#${G_WRAP_MODULE_DIR}#g' \
+	    -e 's#@-G_WRAP_LIB_DIR-@#${G_WRAP_LIB_DIR}#g' \
+            -e 's#@-GNC_BUILDDIR-@#${PWD}/${top_builddir}#g' \
+            -e 's#@-GNC_SRCDIR-@#${PWD}/${top_srcdir}#g'
 	mv $@.tmp $@
 	chmod u+x $@
 CLEANFILES += gnucash-build-env