diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-11-08 14:26:30 -0600 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2011-11-08 22:17:20 -0600 |
| commit | cc806434e7004a51be775fd482e70bd0f5db3431 (patch) | |
| tree | 7a0169e3f6bd262c87af03ac6f7dfa3a2d905e3e | |
| parent | dc15b67b1d4b71209d404773cdf2a7f23d8d79a2 (diff) | |
gb_CFGEXPRECOMMAND is not necessary and can be factorized out of platform/*
| -rw-r--r-- | solenv/gbuild/Configuration.mk | 3 | ||||
| -rw-r--r-- | solenv/gbuild/platform/solaris.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/windows.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/winmingw.mk | 1 |
4 files changed, 1 insertions, 5 deletions
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index c08719dd02b6..b0134c02e910 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -222,8 +222,7 @@ $(call gb_XcuLangpackTarget_get_outdir_target,%) : # XcuMergeTarget class gb_XcuMergeTarget_CFGEXTARGET := $(call gb_Executable_get_target,cfgex) -gb_XcuMergeTarget_CFGEXCOMMAND := \ - $(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_CFGEXTARGET) +gb_XcuMergeTarget_CFGEXCOMMAND := $(gb_Helper_set_ld_path) $(gb_XcuMergeTarget_CFGEXTARGET) gb_XcuMergeTarget_SDFLOCATION := $(SRCDIR)/translations/$(INPATH)/misc/sdf/ # PRJNAME is computed from the stem (parameter $(2)) diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk index 7673320d0fe1..602e41fa3860 100644 --- a/solenv/gbuild/platform/solaris.mk +++ b/solenv/gbuild/platform/solaris.mk @@ -389,7 +389,6 @@ endef # UnoApiTarget - # Python gb_PYTHON_PRECOMMAND := $(gb_Helper_set_ld_path) PYTHONHOME=$(OUTDIR)/lib/python PYTHONPATH=$(OUTDIR)/lib/python:$(OUTDIR)/lib/python/lib-dynload diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk index 89ff9dcaae47..52425e2de65d 100644 --- a/solenv/gbuild/platform/windows.mk +++ b/solenv/gbuild/platform/windows.mk @@ -753,7 +753,6 @@ else gb_WinResTarget__command_dep = endif - # Python gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload" diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk index b467a2a512c6..5f3a7ae1806d 100644 --- a/solenv/gbuild/platform/winmingw.mk +++ b/solenv/gbuild/platform/winmingw.mk @@ -575,7 +575,6 @@ endif # UnoApiTarget - # Python gb_PYTHON_PRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin" PYTHONHOME="$(OUTDIR)/lib/python" PYTHONPATH="$(OUTDIR)/lib/python;$(OUTDIR)/lib/python/lib-dynload" |