[Libreoffice-commits] .: config_host.mk.in configure.ac Makefile.in
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Tue Dec 11 11:23:57 PST 2012
Makefile.in | 2 +-
config_host.mk.in | 1 +
configure.ac | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit e1087161cfdded730db5710b2ed594eba5a53b1d
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Tue Dec 11 13:23:13 2012 -0600
export BUILDDIR in config_host.mk to allow partial build
Change-Id: I865a22e48a3125f40de786933ded8a70c0329a39
diff --git a/Makefile.in b/Makefile.in
index b001642..fd66058 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@ endif
SHELL=/usr/bin/env bash
export SRCDIR:=@SRC_ROOT@
-export BUILDDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
+export BUILDDIR:=@BUILDDIR@
.PHONY : $(filter-out $(BUILDDIR)/config_host.mk,$(MAKECMDGOALS))
diff --git a/config_host.mk.in b/config_host.mk.in
index ffda4d7..accf9fd 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -10,6 +10,7 @@
# to get them into invoked external configures and override pkg-config there.
gb_SPACE:=$(gb_SPACE) $(gb_SPACE)
export SRC_ROOT=@SRC_ROOT@
+export BUILDDIR=@SRC_ROOT@
export ABOUT_BACKGROUND_SVG=@ABOUT_BACKGROUND_SVG@
export ALIGNOF_DOUBLE=@ALIGNOF_DOUBLE@
diff --git a/configure.ac b/configure.ac
index 2b8c4e2..320384c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,7 @@ if test "$build_os" = "cygwin"; then
fi
AC_SUBST(SRC_ROOT)
+AC_SUBST(BUILDDIR)
AC_SUBST(EXEEXT_FOR_BUILD)
AC_SUBST(x_Cygwin)
More information about the Libreoffice-commits
mailing list