diff options
| -rw-r--r-- | external/coinmp/ExternalProject_coinmp.mk | 16 | ||||
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 4 | ||||
| -rw-r--r-- | external/icu/ExternalProject_icu.mk | 6 | ||||
| -rw-r--r-- | external/liborcus/ExternalProject_liborcus.mk | 4 | ||||
| -rw-r--r-- | external/libwpd/ExternalProject_libwpd.mk | 2 | ||||
| -rw-r--r-- | external/libwpg/ExternalProject_libwpg.mk | 2 | ||||
| -rw-r--r-- | external/libxslt/ExternalProject_libxslt.mk | 2 | ||||
| -rw-r--r-- | external/nss/ExternalProject_nss.mk | 22 | ||||
| -rw-r--r-- | external/redland/ExternalProject_rasqal.mk | 2 | ||||
| -rw-r--r-- | external/redland/ExternalProject_redland.mk | 2 |
10 files changed, 31 insertions, 31 deletions
diff --git a/external/coinmp/ExternalProject_coinmp.mk b/external/coinmp/ExternalProject_coinmp.mk index db3b71a82b12..07cb9e248bd6 100644 --- a/external/coinmp/ExternalProject_coinmp.mk +++ b/external/coinmp/ExternalProject_coinmp.mk @@ -40,14 +40,14 @@ $(call gb_ExternalProject_get_state_target,coinmp,build) : && $(MAKE) \ $(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ - $(gb_Package_SOURCEDIR_coinmp)/Cbc/src/.libs/libCbc.3.8.8.dylib \ - $(gb_Package_SOURCEDIR_coinmp)/Cbc/src/.libs/libCbcSolver.3.8.8.dylib \ - $(gb_Package_SOURCEDIR_coinmp)/Cgl/src/.libs/libCgl.1.8.5.dylib \ - $(gb_Package_SOURCEDIR_coinmp)/Clp/src/.libs/libClp.1.12.6.dylib \ - $(gb_Package_SOURCEDIR_coinmp)/Clp/src/OsiClp/.libs/libOsiClp.1.12.6.dylib \ - $(gb_Package_SOURCEDIR_coinmp)/CoinMP/src/.libs/libCoinMP.1.7.6.dylib \ - $(gb_Package_SOURCEDIR_coinmp)/CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib \ - $(gb_Package_SOURCEDIR_coinmp)/Osi/src/Osi/.libs/libOsi.1.11.5.dylib) \ + $(EXTERNAL_WORKDIR)/Cbc/src/.libs/libCbc.3.8.8.dylib \ + $(EXTERNAL_WORKDIR)/Cbc/src/.libs/libCbcSolver.3.8.8.dylib \ + $(EXTERNAL_WORKDIR)/Cgl/src/.libs/libCgl.1.8.5.dylib \ + $(EXTERNAL_WORKDIR)/Clp/src/.libs/libClp.1.12.6.dylib \ + $(EXTERNAL_WORKDIR)/Clp/src/OsiClp/.libs/libOsiClp.1.12.6.dylib \ + $(EXTERNAL_WORKDIR)/CoinMP/src/.libs/libCoinMP.1.7.6.dylib \ + $(EXTERNAL_WORKDIR)/CoinUtils/src/.libs/libCoinUtils.3.9.11.dylib \ + $(EXTERNAL_WORKDIR)/Osi/src/Osi/.libs/libOsi.1.11.5.dylib) \ ) endif diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 988a24b5ed74..17d4f55c6641 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -30,8 +30,8 @@ MAKE_PRE=$(call gb_Helper_extend_ld_path,$(call gb_UnpackedTarball_get_dir,icu)/ MAKE_POST=$(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ - $(gb_Package_SOURCEDIR_firebird)/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.dylib \ - $(gb_Package_SOURCEDIR_firebird)/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.dylib.3.0.0) + $(EXTERNAL_WORKDIR)/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/plugins/libEngine12.dylib \ + $(EXTERNAL_WORKDIR)/gen/$(if $(ENABLE_DEBUG),Debug,Release)/firebird/lib/libfbclient.dylib.3.0.0) $(call gb_ExternalProject_get_state_target,firebird,build): $(call gb_ExternalProject_run,build,\ diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index 4528d62f1d45..1a9c5ff90602 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -77,11 +77,11 @@ $(call gb_ExternalProject_get_state_target,icu,build) : $(if $(filter MACOSX,$(OS)), \ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl \ URELIB \ - $(gb_Package_SOURCEDIR_icu)/source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION) \ - $(gb_Package_SOURCEDIR_icu)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION) \ + $(EXTERNAL_WORKDIR)/source/lib/libicuuc$(gb_Library_DLLEXT).$(icu_VERSION) \ + $(EXTERNAL_WORKDIR)/source/lib/libicui18n$(gb_Library_DLLEXT).$(icu_VERSION) \ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl \ OOO \ - $(gb_Package_SOURCEDIR_icu)/source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)) \ + $(EXTERNAL_WORKDIR)/source/lib/libicudata$(gb_Library_DLLEXT).$(icu_VERSION)) \ ,source) endif diff --git a/external/liborcus/ExternalProject_liborcus.mk b/external/liborcus/ExternalProject_liborcus.mk index dd237eaa1e13..3b7ea728b216 100644 --- a/external/liborcus/ExternalProject_liborcus.mk +++ b/external/liborcus/ExternalProject_liborcus.mk @@ -114,8 +114,8 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) : $(MAKE) \ $(if $(filter MACOSX,$(OS)),\ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ - $(gb_Package_SOURCEDIR_liborcus)/src/liborcus/.libs/liborcus-0.12.0.dylib \ - $(gb_Package_SOURCEDIR_liborcus)/src/parser/.libs/liborcus-parser-0.12.0.dylib \ + $(EXTERNAL_WORKDIR)/src/liborcus/.libs/liborcus-0.12.0.dylib \ + $(EXTERNAL_WORKDIR)/src/parser/.libs/liborcus-parser-0.12.0.dylib \ ) \ ) diff --git a/external/libwpd/ExternalProject_libwpd.mk b/external/libwpd/ExternalProject_libwpd.mk index d01fb77188a0..ddb8c2cd0147 100644 --- a/external/libwpd/ExternalProject_libwpd.mk +++ b/external/libwpd/ExternalProject_libwpd.mk @@ -44,7 +44,7 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) : && $(MAKE) \ $(if $(filter MACOSX,$(OS)),\ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ - $(gb_Package_SOURCEDIR_libwpd)/src/lib/.libs/libwpd-0.10.10.dylib \ + $(EXTERNAL_WORKDIR)/src/lib/.libs/libwpd-0.10.10.dylib \ ) \ ) diff --git a/external/libwpg/ExternalProject_libwpg.mk b/external/libwpg/ExternalProject_libwpg.mk index e05a5261d67d..41fe89e322e5 100644 --- a/external/libwpg/ExternalProject_libwpg.mk +++ b/external/libwpg/ExternalProject_libwpg.mk @@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) : && $(MAKE) \ $(if $(filter MACOSX,$(OS)),\ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ - $(gb_Package_SOURCEDIR_libwpg)/src/lib/.libs/libwpg-0.3.3.dylib \ + $(EXTERNAL_WORKDIR)/src/lib/.libs/libwpg-0.3.3.dylib \ ) \ ) diff --git a/external/libxslt/ExternalProject_libxslt.mk b/external/libxslt/ExternalProject_libxslt.mk index 9dab4766e268..27667299e383 100644 --- a/external/libxslt/ExternalProject_libxslt.mk +++ b/external/libxslt/ExternalProject_libxslt.mk @@ -41,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,libxslt,build): && $(MAKE) \ $(if $(filter MACOSX,$(OS)),\ && $(PERL) $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ - $(gb_Package_SOURCEDIR_libxslt)/libxslt/.libs/libxslt.1.dylib \ + $(EXTERNAL_WORKDIR)/libxslt/.libs/libxslt.1.dylib \ ) \ ) endif diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk index 2b071fe8346a..8ce10b0a4ee9 100644 --- a/external/nss/ExternalProject_nss.mk +++ b/external/nss/ExternalProject_nss.mk @@ -58,17 +58,17 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalExecuta && chmod u+w $(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib/*.dylib \ && $(PERL) \ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libfreebl3.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnspr4.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnss3.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssckbi.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssdbm3.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libnssutil3.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplc4.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libplds4.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libsmime3.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libsoftokn3.dylib \ - $(gb_Package_SOURCEDIR_nss)/dist/out/lib/libssl3.dylib) \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libfreebl3.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libnspr4.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libnss3.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libnssckbi.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libnssdbm3.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libnssutil3.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libplc4.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libplds4.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libsmime3.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libsoftokn3.dylib \ + $(EXTERNAL_WORKDIR)/dist/out/lib/libssl3.dylib) \ ,nss) endif diff --git a/external/redland/ExternalProject_rasqal.mk b/external/redland/ExternalProject_rasqal.mk index c55111ef9fea..5f350233e673 100644 --- a/external/redland/ExternalProject_rasqal.mk +++ b/external/redland/ExternalProject_rasqal.mk @@ -46,7 +46,7 @@ $(call gb_ExternalProject_get_state_target,rasqal,build): && $(MAKE) \ $(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ - $(gb_Package_SOURCEDIR_rasqal)/src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib) \ + $(EXTERNAL_WORKDIR)/src/.libs/librasqal-lo.$(RASQAL_MAJOR).dylib) \ ) # vim: set noet sw=4 ts=4: diff --git a/external/redland/ExternalProject_redland.mk b/external/redland/ExternalProject_redland.mk index e127755da0da..6203fccd3d7c 100644 --- a/external/redland/ExternalProject_redland.mk +++ b/external/redland/ExternalProject_redland.mk @@ -48,7 +48,7 @@ $(call gb_ExternalProject_get_state_target,redland,build): && $(MAKE) \ $(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ - $(gb_Package_SOURCEDIR_redland)/src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib) \ + $(EXTERNAL_WORKDIR)/src/.libs/librdf-lo.$(REDLAND_MAJOR).dylib) \ ) # vim: set noet sw=4 ts=4: |