[vlc-commits] Invoke check_headers with $(SHELL)

Maciej Blizinski git at videolan.org
Fri Mar 2 16:57:15 CET 2012


vlc | branch: master | Maciej Blizinski <maciej at opencsw.org> | Thu Mar  1 00:55:49 2012 +0100| [d1a8b724c3923bb37002e5102cae25d9594a9a95] | committer: Rémi Denis-Courmont

Invoke check_headers with $(SHELL)

Otherwise, it gets executed with /bin/sh which on Solaris does not support the
$(...) construct. This causes 'gmake check' to fail. For example:

../src/check_headers: $(dirname ../src/check_headers): does not exist

Calling check_headers with $(SHELL) explicitly makes use of CONFIG_SHELL.

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d1a8b724c3923bb37002e5102cae25d9594a9a95
---

 lib/Makefile.am |    2 +-
 src/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 339d3b4..4ad0e21 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -75,4 +75,4 @@ pkgconfig_DATA = libvlc.pc
 	$(SHELL) ./config.status --file="lib/$@"
 
 check-local:
-	$(top_srcdir)/src/check_headers $(pkginclude_HEADERS)
+	$(SHELL) $(top_srcdir)/src/check_headers $(pkginclude_HEADERS)
diff --git a/src/Makefile.am b/src/Makefile.am
index b35f38e..81b01fb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -531,7 +531,7 @@ check-local:
 			exit 1; \
 		fi ; \
 	done
-	$(srcdir)/check_headers $(pluginsinclude_HEADERS)
+	$(SHELL) $(srcdir)/check_headers $(pluginsinclude_HEADERS)
 
 FORCE:
 	@echo "Generated source cannot be phony. Go away." >&2



More information about the vlc-commits mailing list