[Libreoffice-commits] .: apache-commons/ExternalProject_apache_commons_codec.mk apache-commons/ExternalProject_apache_commons_httpclient.mk apache-commons/ExternalProject_apache_commons_lang.mk apache-commons/ExternalProject_apache_commons_logging.mk

[Libreoffice Gerrit user]

 apache-commons/ExternalProject_apache_commons_codec.mk      |    2 +-
 apache-commons/ExternalProject_apache_commons_httpclient.mk |    2 +-
 apache-commons/ExternalProject_apache_commons_lang.mk       |    2 +-
 apache-commons/ExternalProject_apache_commons_logging.mk    |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 1cb87841f452ad7bb52aa0279edba6b6e980fbc7
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Thu Sep 27 07:33:53 2012 -0500

    use a form that please /bin/dash in apache_commons build script
    
    Change-Id: I2a7061f428d402751627fc93ca559e119aab94d2

diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk b/apache-commons/ExternalProject_apache_commons_codec.mk
index 7e07d39..cf3a284 100644
--- a/apache-commons/ExternalProject_apache_commons_codec.mk
+++ b/apache-commons/ExternalProject_apache_commons_codec.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_ExternalProject_register_targets,apache_commons_codec,\
 
 $(call gb_ExternalProject_get_state_target,apache_commons_codec,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,apache_commons_codec)" && \
-	ANT_OPTS+="-Dfile.encoding=ISO-8859-1" \
+	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
 	"$(ANT)" \
 		-q \
 		-f build.xml \
diff --git a/apache-commons/ExternalProject_apache_commons_httpclient.mk b/apache-commons/ExternalProject_apache_commons_httpclient.mk
index e1a55bd..9dad40d 100644
--- a/apache-commons/ExternalProject_apache_commons_httpclient.mk
+++ b/apache-commons/ExternalProject_apache_commons_httpclient.mk
@@ -23,7 +23,7 @@ $(eval $(call gb_ExternalProject_register_targets,apache_commons_httpclient,\
 
 $(call gb_ExternalProject_get_state_target,apache_commons_httpclient,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,apache_commons_httpclient)" && \
-	ANT_OPTS+="-Dfile.encoding=ISO-8859-1" \
+	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
 	"$(ANT)" \
 		-q \
 		-f build.xml \
diff --git a/apache-commons/ExternalProject_apache_commons_lang.mk b/apache-commons/ExternalProject_apache_commons_lang.mk
index 87ac5e0..23c3b56 100644
--- a/apache-commons/ExternalProject_apache_commons_lang.mk
+++ b/apache-commons/ExternalProject_apache_commons_lang.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_ExternalProject_register_targets,apache_commons_lang,\
 
 $(call gb_ExternalProject_get_state_target,apache_commons_lang,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,apache_commons_lang)" && \
-	ANT_OPTS+="-Dfile.encoding=ISO-8859-1" \
+	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
 	"$(ANT)" \
 		-q \
 		-f build.xml \
diff --git a/apache-commons/ExternalProject_apache_commons_logging.mk b/apache-commons/ExternalProject_apache_commons_logging.mk
index d51c3a9..fce2635 100644
--- a/apache-commons/ExternalProject_apache_commons_logging.mk
+++ b/apache-commons/ExternalProject_apache_commons_logging.mk
@@ -20,7 +20,7 @@ $(eval $(call gb_ExternalProject_register_targets,apache_commons_logging,\
 
 $(call gb_ExternalProject_get_state_target,apache_commons_logging,build) :
 	cd "$(call gb_UnpackedTarball_get_dir,apache_commons_logging)" && \
-	ANT_OPTS+="-Dfile.encoding=ISO-8859-1" \
+	ANT_OPTS="$$ANT_OPTS -Dfile.encoding=ISO-8859-1" \
 	"$(ANT)" \
 		-q \
 		-f build.xml \