solenv/gbuild/platform/NETBSD_INTEL_GCC.mk | 4 ++-- solenv/gbuild/platform/NETBSD_X86_64_GCC.mk | 4 ++-- solenv/gbuild/platform/com_GCC_defs.mk | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
New commits: commit a481a40961bf6a5036ecd1c0550f45b50e7b221f Author: Stephan Bergmann <[email protected]> Date: Fri Sep 21 14:14:34 2012 +0200 Cut/paste typos Change-Id: I2ff0ee983d008d580bd9d52cedc2643293b9710e diff --git a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk index 81afdf3..cadcec4 100644 --- a/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk +++ b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk @@ -34,7 +34,7 @@ include $(GBUILDDIR)/platform/unxgcc.mk NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib -gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH) -gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}$(OUTDIR)/lib:$(NB_ADD_LIBPATH) +gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH) +gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR)/lib:$(NB_ADD_LIBPATH) # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk index 3ece48b..9636971 100644 --- a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk +++ b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk @@ -33,7 +33,7 @@ include $(GBUILDDIR)/platform/unxgcc.mk NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib -gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH) -gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}$(OUTDIR)/lib:$(NB_ADD_LIBPATH) +gb_Helper_set_ld_path := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH) +gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(OUTDIR)/lib:$(NB_ADD_LIBPATH) # vim: set noet sw=4: diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk index 6145e82..c851b74 100644 --- a/solenv/gbuild/platform/com_GCC_defs.mk +++ b/solenv/gbuild/platform/com_GCC_defs.mk @@ -152,7 +152,7 @@ else gb_Helper_LIBRARY_PATH_VAR := LD_LIBRARY_PATH endif -gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+:$$$(gb_Helper_LIBRARY_PATH_VAR)}"$(OUTDIR_FOR_BUILD)/lib" +gb_Helper_set_ld_path := $(gb_Helper_LIBRARY_PATH_VAR)=$${$(gb_Helper_LIBRARY_PATH_VAR):+$$$(gb_Helper_LIBRARY_PATH_VAR):}"$(OUTDIR_FOR_BUILD)/lib" # $(1): list of directory pathnames to append at the end of the ld path define gb_Helper_extend_ld_path _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
