[Mesa-stable] [PATCH 02/12] xmlpool: remove LOCALEDIR variable/fix bmake

Emil Velikov emil.l.velikov at gmail.com
Fri Jul 17 10:29:24 PDT 2015


The constuct used is GNU make specific thus building with bmake would
fail as below. With this change we can finally build mesa with bmake.
Perhaps this will convince the BSD people to switch to the build
upstream provides :)

--- options.h ---
LOCALEDIR := .
sh: line 2: LOCALEDIR: command not found
*** [options.h] Error code 127

XXX: With this change one can build mesa from a tarball with bmake.
Building from git or bmake dist requires more work, most of which
is addressed by the follow-up patches.

Cc: 10.6 <mesa-stable at lists.freedesktop.org>
Cc: Jonathan Gray <jsg at jsg.id.au>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/mesa/drivers/dri/common/xmlpool/Makefile.am | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/common/xmlpool/Makefile.am b/src/mesa/drivers/dri/common/xmlpool/Makefile.am
index a6f1652..81b6e46 100644
--- a/src/mesa/drivers/dri/common/xmlpool/Makefile.am
+++ b/src/mesa/drivers/dri/common/xmlpool/Makefile.am
@@ -67,9 +67,8 @@ CLEANFILES = \
 	$(MOS)
 
 # Default target options.h
-options.h: LOCALEDIR := .
 options.h: t_options.h $(MOS)
-	$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py $(srcdir)/t_options.h $(LOCALEDIR) $(LANGS) > options.h
+	$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/gen_xmlpool.py $(srcdir)/t_options.h . $(LANGS) > options.h
 
 # Update .mo files from the corresponding .po files.
 %/LC_MESSAGES/options.mo: %.po
-- 
2.4.5



More information about the mesa-stable mailing list