diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-11-06 16:36:04 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-11-07 14:27:50 -0600 |
| commit | b8002169336b6b7597d32755e41fa3dc2688539e (patch) | |
| tree | dde6d4ce209e09aa2140575aa1f8386144f76af6 /external | |
| parent | 7fb73e6c30e66f028fe759376e3789456bf3ad33 (diff) | |
remove INPATH and PROEXT
- WORKDIR path is just workdir
- INSTDIR path is just instdir
- WORKDIR_FOR_BUILD is workdir_for_build
- INSTDIR_FOR_BUILD is instdir_for_build
- replace other usage of INPATH by combination of OS and CPUNAME
Change-Id: Ie398387ebd82a968ec2605f2103c55b43a231482
Reviewed-on: https://gerrit.libreoffice.org/6601
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/icu/ExternalProject_icu.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/icu/ExternalProject_icu.mk b/external/icu/ExternalProject_icu.mk index 2d6501543906..26d90b5337f8 100644 --- a/external/icu/ExternalProject_icu.mk +++ b/external/icu/ExternalProject_icu.mk @@ -37,7 +37,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),-shared-libgcc)" \ ./configure \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ - --with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source) \ + --with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source) \ --disable-layout --disable-static --enable-shared --disable-samples \ && $(MAKE) \ && for lib in icudata icuin icuuc; do \ @@ -84,7 +84,7 @@ $(call gb_ExternalProject_get_state_target,icu,build) : --enable-static --disable-shared,\ --disable-static --enable-shared $(if $(filter ANDROID,$(OS)),--with-library-suffix=lo)) \ $(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)\ - --with-cross-build=$(subst $(INPATH),$(INPATH_FOR_BUILD),$(call gb_UnpackedTarball_get_dir,icu))/source)\ + --with-cross-build=$(WORKDIR_FOR_BUILD)/UnpackedTarball/icu/source)\ && $(MAKE) \ $(if $(filter MACOSX,$(OS)),&& $(PERL) \ $(SRCDIR)/solenv/bin/macosx-change-install-names.pl shl OOO \ |