incubator-ooo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Maho NAKATA <m...@apache.org>
Subject small patch to AOO
Date Fri, 28 Sep 2012 02:28:26 GMT
Hi Pedro and *,

do you mind applying follwing patch?

FreeBSD system sed doesn't accept -i itself.
it should be -i.bak and it looks we should specify
prior to -r or -e.

$ less files/patch-sed 
--- swext/mediawiki/makefile.mk 2012-09-21 20:36:58.000000000 +0900
+++ swext/mediawiki/makefile.mk 2012-09-26 16:36:38.000000000 +0900
@@ -50,10 +50,10 @@
 
 fix_system_commons:
        @echo "Fix Java Class-Path entry for Apache Commons libraries from system."
-       @$(SED) -r -e "s#(name=\"Class-Path\" value=\").*\"#\1file://$(COMMONS_CODEC_JAR)
file://$(COMMONS_LANG_JAR) \
-file://$(COMMONS_HTTPCLIENT_JAR) file://$(COMMONS_LOGGING_JAR)\"#" -i build.xml
+       @$(SED) -i.bak -r -e "s#(name=\"Class-Path\" value=\").*\"#\1file://$(COMMONS_CODEC_JAR)
file://$(COMMONS_LANG_JAR) \
+file://$(COMMONS_HTTPCLIENT_JAR) file://$(COMMONS_LOGGING_JAR)\"#" build.xml
        @echo "Unbundle Apache Commons libraries from Mediawiki Presentation extension."
-       @$(SED) '/file="..commons/d' -i build.xml
+       @$(SED) -i.bak '/file="..commons/d' build.xml
 
 .ELSE
 @all:

Thanks
 Nakata Maho

Mime
View raw message