Author: truckman
Date: Fri Sep 29 08:32:26 2017
New Revision: 1810071
URL: http://svn.apache.org/viewvc?rev=1810071&view=rev
Log:
Pass SYSTEM_APACHE_COMMONS all the way down so that we don't try to
package the non-existant commons-lang3-3.3.jar file if
--with-system-apache-commons=yes was passed to configure.
Modified:
openoffice/trunk/main/scp2/source/ooo/makefile.mk
Modified: openoffice/trunk/main/scp2/source/ooo/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/makefile.mk?rev=1810071&r1=1810070&r2=1810071&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/makefile.mk (original)
+++ openoffice/trunk/main/scp2/source/ooo/makefile.mk Fri Sep 29 08:32:26 2017
@@ -302,6 +302,10 @@ SCPDEFS+=-DSYSTEM_LIBJPEG
SCPDEFS+=-DSYSTEM_PANGO
.ENDIF
+.IF "$(SYSTEM_APACHE_COMMONS)" == "YES"
+SCPDEFS+=-DSYSTEM_APACHE_COMMONS
+.ENDIF
+
.IF "${MACOSX_DEPLOYMENT_TARGET}" != ""
SCPDEFS+=-DMACOSX_DEPLOYMENT_TARGET_NUM=${MACOSX_DEPLOYMENT_TARGET:s/.//}
.ENDIF
