diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-11-30 14:49:13 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-12-07 15:53:01 +0100 |
| commit | fff30fefb48e0a729f266c38f97ee4654c0b7ea1 (patch) | |
| tree | a5d398eba53c76d2cb495965e5beabec19b50dd6 /solenv | |
| parent | 1c792d9c39328f210a6f859612ca0aa6d81a19eb (diff) | |
do not globally export gb_AWK, GBUILDDIR, SRCDIR, gb_XSLTPROC
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/CustomTarget.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/gbuild.mk | 6 |
2 files changed, 1 insertions, 6 deletions
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index a75c1f8c8575..88e5f99423aa 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -30,6 +30,7 @@ define gb_CustomTarget__command +$(call gb_Helper_abbreviate_dirs,\ mkdir -p $(call gb_CustomTarget_get_workdir,$(2)) && \ + gb_AWK=$(gb_AWK) gb_XSLTPROC=$(gb_XSLTPROC) GBUILDDIR=$(GBUILDDIR) SRCDIR=$(SRCDIR) \ $(MAKE) -C $(call gb_CustomTarget_get_workdir,$(2)) -f $< && \ touch $(1)) diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk index d7033f041e14..9f0b32b540c9 100644 --- a/solenv/gbuild/gbuild.mk +++ b/solenv/gbuild/gbuild.mk @@ -331,12 +331,6 @@ gb_PYTHONTARGET := $(OUTDIR)/bin/python gb_PYTHON := $(gb_PYTHON_PRECOMMAND) $(gb_PYTHONTARGET) endif -export gb_AWK -export gb_XSLTPROC -export GBUILDDIR -# FIXME exporting SRCDIR seems kind of a hack -export SRCDIR - define gb_HelpMessage NAME gbuild - GNU make based build system for LibreOffice |