diff options
Diffstat (limited to 'instsetoo_native')
-rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 6 | ||||
-rw-r--r-- | instsetoo_native/Package_setup.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 930e66d25bc9..603fcd387570 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -67,10 +67,10 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/ooenv : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) ( \ - echo 'java_path=`$(INSTDIR)/ure/bin/javaldx 2>/dev/null`' && \ - echo 'export LD_LIBRARY_PATH="$(INSTDIR)/program:$$java_path$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}"' && \ + echo 'java_path=`$(gb_INSTROOT)/ure/bin/javaldx 2>/dev/null`' && \ + echo 'export LD_LIBRARY_PATH="$(gb_INSTROOT)/program:$$java_path$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}"' && \ echo 'ulimit -c unlimited' && \ - echo 'export PATH="$(INSTDIR)/program:$(INSTDIR)/ure/bin:$$PATH"' && \ + echo 'export PATH="$(gb_INSTROOT)/program:$(gb_INSTROOT)/ure/bin:$$PATH"' && \ echo 'export GNOME_DISABLE_CRASH_DIALOG=1' && \ echo '# debugging assistance' && \ echo 'export SAL_DISABLE_FLOATGRAB=1' && \ diff --git a/instsetoo_native/Package_setup.mk b/instsetoo_native/Package_setup.mk index f75dc84e1997..2cd15fcfb8d0 100644 --- a/instsetoo_native/Package_setup.mk +++ b/instsetoo_native/Package_setup.mk @@ -9,7 +9,7 @@ $(eval $(call gb_Package_Package,instsetoo_native_setup,$(call gb_CustomTarget_get_workdir,instsetoo_native/setup))) -$(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(INSTDIR))) +$(eval $(call gb_Package_set_outdir,instsetoo_native_setup,$(gb_INSTROOT))) $(eval $(call gb_Package_add_files,instsetoo_native_setup,$(gb_PROGRAMDIRNAME),\ $(call gb_Helper_get_rcfile,bootstrap) \ |