diff options
| author | Thorsten Behrens <thorsten.behrens@cib.de> | 2019-06-11 01:24:26 +0200 |
|---|---|---|
| committer | Vasily Melenchuk <vasily.melenchuk@cib.de> | 2020-12-05 19:21:15 +0300 |
| commit | 0174cacaf209f274e0868bce889e4576d248c754 (patch) | |
| tree | 85bf5a120d8d4dc0680cde5d14ae2e0743c6ae40 /instsetoo_native | |
| parent | 30d55743834d58ae54ab10ce7be7474703678b36 (diff) | |
Some product-name-with-spaces fixes
- use productname var w/o space for config dir
..which also saves some duplicated code
- add hack to make rpmbuild get a proper build root
-> otherwise rpm BUILDROOT will contain spaces, and things break
at various places during packaging
Change-Id: I20229ce533913fa000978aa84b1a2a5d998da14d
Conflicts:
instsetoo_native/CustomTarget_setup.mk
Change-Id: I5d9f20a99587309c4ee3f4a38c8d2b6dcce9b8b5
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_install.mk | 2 | ||||
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/instsetoo_native/CustomTarget_install.mk b/instsetoo_native/CustomTarget_install.mk index ab620d5844ed..ba7a48c30c28 100644 --- a/instsetoo_native/CustomTarget_install.mk +++ b/instsetoo_native/CustomTarget_install.mk @@ -62,7 +62,7 @@ export LOCAL_COMMON_OUT := $(instsetoo_OUT) instsetoo_native_WITH_LANG := en-US $(filter-out en-US,$(gb_WITH_LANG)) -PRODUCTNAME_no_spaces := $(subst $(WHITESPACE),,$(PRODUCTNAME)) +PRODUCTNAME_no_spaces := $(PRODUCTNAME_WITHOUT_SPACES) ifeq (WNT,$(OS)) define instsetoo_native_msitemplates diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index b30f78052f9c..16cc6ebaded1 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -40,7 +40,7 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo 'InstallMode=<installmode>' \ && echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \ $(if $(ENABLE_RELEASE_BUILD),\ - && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out HAIKU MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(shell echo $(PRODUCTNAME) | sed -e 's/ /%20/g'))/4', \ + && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out HAIKU MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME_WITHOUT_SPACES) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME_WITHOUT_SPACES))/4', \ && echo 'UserInstallation=$$ORIGIN/..') \ ) > $@ |