diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-09-12 00:41:03 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-12 00:44:23 +0200 |
| commit | 5bab11089f40919310eb9e469bcbc89193ae2a5f (patch) | |
| tree | 3cb48d2343f59b7f6239f294f077f26aded5d332 /instsetoo_native | |
| parent | d7e72bef24b911ae2c5639535869c970c994878b (diff) | |
put appropriate UserInstallation in bootstraprc on !ENABLE_RELEASE_BUILD
This used to be handled by the "LOCALUSERDIR $ORIGIN/.." line for
LibreOffice_Dev in openoffice.lst.in but that won't affect INSTDIR.
Change-Id: I1acd1ee7c08c98443e1cc425e1a6bb872d7c81f7
Diffstat (limited to 'instsetoo_native')
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 6a077c46183e..a4c88930fe5c 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -34,7 +34,9 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && echo '[Bootstrap]' \ && echo 'InstallMode=<installmode>' \ && echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \ - && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME))/$(LIBO_VERSION_MAJOR)' \ + $(if $(ENABLE_RELEASE_BUILD),\ + && echo 'UserInstallation=$$SYSUSERCONFIG/$(if $(filter-out MACOSX WNT,$(OS)),$(shell echo $(PRODUCTNAME) | tr "[:upper:]" "[:lower:]"),$(PRODUCTNAME))/$(LIBO_VERSION_MAJOR)', \ + && echo 'UserInstallation=$$ORIGIN/..') \ ) > $@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_rcfile,fundamental) : |