[Libreoffice-commits] .: 2 commits - solenv/gbuild

[Bjoern Michaelsen]

 solenv/gbuild/BuildDirs.mk       |    4 +++-
 solenv/gbuild/TargetLocations.mk |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 63c97a3afd7c43e70b4ad8e62dc07f28665a767c
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Jul 25 11:05:15 2011 +0200

    Package is no outdir target

diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index f66e91a..1e7d12c 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -134,6 +134,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	Module \
 	NoexPrecompiledHeader \
 	PackagePart \
+	Package \
 	PrecompiledHeader \
 	RdbTarget \
 	ResTarget \
@@ -150,7 +151,6 @@ $(eval $(call gb_Helper_make_clean_targets,\
 $(eval $(call gb_Helper_make_outdir_clean_targets,\
 	Executable \
 	Library \
-	Package \
 	StaticLibrary \
 	UnoApiOutTarget \
 ))
commit ec7a26971c772e419616928f2fba194693fa763e
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon Jul 25 09:37:06 2011 +0200

    remove duplicate assignment of WORKDIR, configure/set_soenv is enough

diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index daa40c1..9139143 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -30,7 +30,9 @@ SOLARINC += $(JDKINCS)
 
 OUTDIR := $(SOLARVERSION)/$(INPATH)
 OUTDIR_FOR_BUILD := $(SOLARVERSION)/$(INPATH_FOR_BUILD)
-WORKDIR := $(SOLARVERSION)/$(INPATH)/workdir
+ifeq ($(strip $(WORKDIR)),)
+$(error WORKDIR variable is empty, no environment set, aborting)
+endif
 
 # Override for SetupLocal
 ifneq ($(and $(gb_LOCALBUILDDIR),$(wildcard $(gb_LOCALBUILDDIR)/SetupLocal.mk)),)