Mesa (master): gallium: Fix install-gallium-links.mk on non-bash /bin/sh

Eric Anholt anholt at kemper.freedesktop.org
Mon Oct 10 16:17:03 UTC 2016


Module: Mesa
Branch: master
Commit: ec9ed1c4d8f1005ea8b00fa673257564310d96a8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec9ed1c4d8f1005ea8b00fa673257564310d96a8

Author: Eric Anholt <eric at anholt.net>
Date:   Thu Oct  6 15:19:21 2016 -0700

gallium: Fix install-gallium-links.mk on non-bash /bin/sh

Debian uses dash by default, which doesn't do '+='.  Fixes servo's
osmesa-based headless testing system, which was looking for libOSMesa in
the lib/ directory.

Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Cc: mesa-stable at lists.freedesktop.org

---

 install-gallium-links.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/install-gallium-links.mk b/install-gallium-links.mk
index ac5a499..fc2f75d 100644
--- a/install-gallium-links.mk
+++ b/install-gallium-links.mk
@@ -13,8 +13,8 @@ all-local : .install-gallium-links
 	fi;							\
 	$(MKDIR_P) $$link_dir;					\
 	file_list="$(dri_LTLIBRARIES:%.la=.libs/%.so)";		\
-	file_list+="$(egl_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)";	\
-	file_list+="$(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)";	\
+	file_list="$$file_list$(egl_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)";	\
+	file_list="$$file_list$(lib_LTLIBRARIES:%.la=.libs/%.$(LIB_EXT)*)";	\
 	for f in $$file_list; do 				\
 		if test -h .libs/$$f; then			\
 			cp -d $$f $$link_dir;			\




More information about the mesa-commit mailing list