summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2015-07-15 10:28:05 +0100
committerEmil Velikov <[email protected]>2015-09-11 19:19:30 +0100
commit0c9f66829c24a0102ee38fc222fb8cbe5d6c177b (patch)
treec9e0f3752836c6528b1847cdf63f4f52d6a67ddb /src
parent11dc43424d691220e68eecf1d3f4b5387cca5d47 (diff)
xmlpool: 'promote' LOCALEDIR variable
This is the only place in mesa that uses this constuct which seems to be GNUmake-ism. Attempting to build with POSIX make implementations (bmake) would fail as below. --- options.h --- LOCALEDIR := . sh: line 2: LOCALEDIR: command not found *** [options.h] Error code 127 So let's keep things consistent and compatible by making the variable non target specific. v2: - Bring back LOCALEDIR. - Reword the commit message - Change mesa-stable tag 10.6 > 11.0 Cc: 11.0 <[email protected]> Cc: Jonathan Gray <[email protected]> Signed-off-by: Emil Velikov <[email protected]> (cherry picked from commit c8984a7a4686c2045666d32fbe5733ff5a5c3bd8)
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/common/xmlpool/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/common/xmlpool/Makefile.am b/src/mesa/drivers/dri/common/xmlpool/Makefile.am
index a6f1652d105..dfd8fb8dc6d 100644
--- a/src/mesa/drivers/dri/common/xmlpool/Makefile.am
+++ b/src/mesa/drivers/dri/common/xmlpool/Makefile.am
@@ -67,7 +67,7 @@ CLEANFILES = \
$(MOS)
# Default target options.h
-options.h: LOCALEDIR := .
+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