configure.ac | 1 + sal/ZipPackage_sal_generated.mk | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-)
New commits: commit 46ce3a214d5ebc165a0a3e313a46ded9b87b9ab2 Author: Tor Lillqvist <[email protected]> Date: Wed Feb 27 22:12:02 2013 +0200 Use config_$(gb_Side), not config_host Change-Id: I174f6bec7770ee029e5c452781f1de995c21e625 diff --git a/sal/ZipPackage_sal_generated.mk b/sal/ZipPackage_sal_generated.mk index b52d335..d6ffde7 100644 --- a/sal/ZipPackage_sal_generated.mk +++ b/sal/ZipPackage_sal_generated.mk @@ -25,7 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_ZipPackage_ZipPackage,sal_generated,$(BUILDDIR)/config_host)) +$(eval $(call gb_ZipPackage_ZipPackage,sal_generated,$(BUILDDIR)/config_$(gb_Side))) $(eval $(call gb_ZipPackage_add_file,sal_generated,inc/udkversion.mk,include/udkversion.mk,udkversion.mk)) commit ea5e3eabb8c4bc96aae864853bb702631507daa5 Author: Tor Lillqvist <[email protected]> Date: Wed Feb 27 22:11:26 2013 +0200 Copy also udkversion.mk to config_build when cross-compiling Change-Id: I785ef3591b873b208b9b3b4de1deff04e0721213 diff --git a/configure.ac b/configure.ac index 503c061..9d60a7f 100644 --- a/configure.ac +++ b/configure.ac @@ -4108,6 +4108,7 @@ if test "$cross_compiling" = "yes"; then cp config.log ../config.Build.log mkdir -p ../config_build cp config_host/*.h ../config_build + cp config_host/udkversion.mk ../config_build . ./bin/get_config_variables COM GUI OS PATH CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH PYTHON SYSTEM_LIBXSLT OUTDIR SOLARINC SOLARLIB WORKDIR for V in COM GUI OS CPU CPUNAME CC CXX DISABLE_PYTHON MACOSX_DEPLOYMENT_TARGET INPATH OUTPATH \ _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
