diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-12-27 12:49:46 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2012-12-27 12:49:46 -0600 |
| commit | ac9001b5dcc480942c19d9e06ece70cbc24444e1 (patch) | |
| tree | c29358aefaf3baf5aab5f6b691945bae33dddc77 | |
| parent | 879f3aa79f524658f0698717e3eef5c361310531 (diff) | |
fix UnpackedTarget strip_components snaffu
Change-Id: I002470c2888d6dec876af18c2c016cc789eb399e
| -rw-r--r-- | icu/UnpackedTarball_icu_data.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/UnpackedTarball.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/icu/UnpackedTarball_icu_data.mk b/icu/UnpackedTarball_icu_data.mk index 25274f1a595f..bc406a0c55a6 100644 --- a/icu/UnpackedTarball_icu_data.mk +++ b/icu/UnpackedTarball_icu_data.mk @@ -9,6 +9,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,icu_data)) -$(eval $(call gb_UnpackedTarball_set_tarball,icu_data,$(ICU_DATA_SUBSET_ZIP))) +$(eval $(call gb_UnpackedTarball_set_tarball,icu_data,$(ICU_DATA_SUBSET_ZIP),0)) # vim: set noet sw=4 ts=4: diff --git a/solenv/gbuild/UnpackedTarball.mk b/solenv/gbuild/UnpackedTarball.mk index f68da6722a80..e6ed63851490 100644 --- a/solenv/gbuild/UnpackedTarball.mk +++ b/solenv/gbuild/UnpackedTarball.mk @@ -21,7 +21,7 @@ gb_UnpackedTarget_STRIP_COMPONENTS_ZIP_DEFAULT := 0 define gb_UnpackedTarget__get_strip_components $(strip $(if $(2),\ $(2),\ - $(if $(filter .zip,$(suffix $(1))),\ + $(if $(filter zip,$(suffix $(1))),\ $(gb_UnpackedTarget_STRIP_COMPONENTS_ZIP_DEFAULT),\ $(gb_UnpackedTarget_STRIP_COMPONENTS_TAR_DEFAULT) \ ) \ |