[vlc-commits] contrib: use $(MAKE)

[Rafaël Carré]

vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Fri Jan 27 06:57:02 2012 -0500| [4fd211c2e6ecd6d8d714330787a1d61688687b3e] | committer: Jean-Baptiste Kempf

contrib: use $(MAKE)
(cherry picked from commit 8f1c7e1272b6840df3236449b7b0d495c7733139)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/gettext/rules.mak   |    6 +++---
 contrib/src/libmpeg2/rules.mak  |    4 ++--
 contrib/src/portaudio/rules.mak |    2 +-
 contrib/src/regex/rules.mak     |    2 +-
 contrib/src/sqlite/rules.mak    |    2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/contrib/src/gettext/rules.mak b/contrib/src/gettext/rules.mak
index 67a59cc..032934b 100644
--- a/contrib/src/gettext/rules.mak
+++ b/contrib/src/gettext/rules.mak
@@ -25,15 +25,15 @@ DEPS_gettext = iconv $(DEPS_iconv)
 .gettext: gettext
 	#cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-relocatable --disable-java --disable-native-java --without-emacs
 	#cd $< && $(MAKE) install
-	#cd $< && make -C gettext-runtime/intl && make -C gettext-runtime/intl install && make -C gettext-tools/misc install
+	#cd $< && $(MAKE) -C gettext-runtime/intl && $(MAKE) -C gettext-runtime/intl install && $(MAKE) -C gettext-tools/misc install
 	#touch $@
 
 ifdef HAVE_WIN32
 	(cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-relocatable --disable-java --disable-native-java --disable-threads)
-	(cd $< && make -C gettext-runtime install && make -C gettext-tools/misc install && make -C gettext-tools/m4 install)
+	(cd $< && $(MAKE) -C gettext-runtime install && $(MAKE) -C gettext-tools/misc install && $(MAKE) -C gettext-tools/m4 install)
 else
 	(cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-java --disable-native-java --without-emacs)
-	(cd $< && make -C gettext-runtime install && make -C gettext-tools/intl && make -C gettext-tools/libgrep && make -C gettext-tools/gnulib-lib && make -C gettext-tools/src install && make -C gettext-tools/misc install && make -C gettext-tools/m4 install)
+	(cd $< && $(MAKE) -C gettext-runtime install && $(MAKE) -C gettext-tools/intl && $(MAKE) -C gettext-tools/libgrep && $(MAKE) -C gettext-tools/gnulib-lib && $(MAKE) -C gettext-tools/src install && $(MAKE) -C gettext-tools/misc install && $(MAKE) -C gettext-tools/m4 install)
 endif
 # Work around another non-sense of autoconf.
 ifdef HAVE_WIN32
diff --git a/contrib/src/libmpeg2/rules.mak b/contrib/src/libmpeg2/rules.mak
index 2b2bf10..505a5b9 100644
--- a/contrib/src/libmpeg2/rules.mak
+++ b/contrib/src/libmpeg2/rules.mak
@@ -22,6 +22,6 @@ libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz .sum-libmpeg2
 
 .libmpeg2: libmpeg2
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --without-x --disable-sdl
-	cd $</libmpeg2 && make && make install
-	cd $</include && make && make install
+	cd $</libmpeg2 && $(MAKE) && $(MAKE) install
+	cd $</include && $(MAKE) && $(MAKE) install
 	touch $@
diff --git a/contrib/src/portaudio/rules.mak b/contrib/src/portaudio/rules.mak
index c5750c8..60fceaa 100644
--- a/contrib/src/portaudio/rules.mak
+++ b/contrib/src/portaudio/rules.mak
@@ -22,5 +22,5 @@ portaudio: portaudio-$(PORTAUDIO_VERSION).tar.gz .sum-portaudio
 
 .portaudio: portaudio
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
-	cd $< && make && make install
+	cd $< && $(MAKE) && $(MAKE) install
 	touch $@
diff --git a/contrib/src/regex/rules.mak b/contrib/src/regex/rules.mak
index 88221c7..c9218ad 100644
--- a/contrib/src/regex/rules.mak
+++ b/contrib/src/regex/rules.mak
@@ -18,6 +18,6 @@ regex: regex-$(REGEX_VERSION).tar.gz .sum-regex
 
 .regex: regex
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
-	cd $< && make subirs=
+	cd $< && $(MAKE) subirs=
 	cd $< && $(AR) rcvu libregex.a regex.o && $(RANLIB) libregex.a && cp -v regex.h $(PREFIX)/include && cp -v libregex.a $(PREFIX)/lib
 	touch $@
diff --git a/contrib/src/sqlite/rules.mak b/contrib/src/sqlite/rules.mak
index 2721b6e..e38ce368 100644
--- a/contrib/src/sqlite/rules.mak
+++ b/contrib/src/sqlite/rules.mak
@@ -20,5 +20,5 @@ sqlite: sqlite-$(SQLITE_VERSION).tar.gz .sum-sqlite
 
 .sqlite: sqlite
 	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
-	cd $< && make && make install
+	cd $< && $(MAKE) && $(MAKE) install
 	touch $@