Commit 4fd211c2 authored by Rafaël Carré's avatar Rafaël Carré Committed by Jean-Baptiste Kempf

contrib: use $(MAKE)

(cherry picked from commit 8f1c7e1272b6840df3236449b7b0d495c7733139)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent e85f60e2
...@@ -25,15 +25,15 @@ DEPS_gettext = iconv $(DEPS_iconv) ...@@ -25,15 +25,15 @@ DEPS_gettext = iconv $(DEPS_iconv)
.gettext: gettext .gettext: gettext
#cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-relocatable --disable-java --disable-native-java --without-emacs #cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-relocatable --disable-java --disable-native-java --without-emacs
#cd $< && $(MAKE) install #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 $@ #touch $@
ifdef HAVE_WIN32 ifdef HAVE_WIN32
(cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-relocatable --disable-java --disable-native-java --disable-threads) (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 else
(cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --disable-java --disable-native-java --without-emacs) (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 endif
# Work around another non-sense of autoconf. # Work around another non-sense of autoconf.
ifdef HAVE_WIN32 ifdef HAVE_WIN32
......
...@@ -22,6 +22,6 @@ libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz .sum-libmpeg2 ...@@ -22,6 +22,6 @@ libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz .sum-libmpeg2
.libmpeg2: libmpeg2 .libmpeg2: libmpeg2
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --without-x --disable-sdl cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --without-x --disable-sdl
cd $</libmpeg2 && make && make install cd $</libmpeg2 && $(MAKE) && $(MAKE) install
cd $</include && make && make install cd $</include && $(MAKE) && $(MAKE) install
touch $@ touch $@
...@@ -22,5 +22,5 @@ portaudio: portaudio-$(PORTAUDIO_VERSION).tar.gz .sum-portaudio ...@@ -22,5 +22,5 @@ portaudio: portaudio-$(PORTAUDIO_VERSION).tar.gz .sum-portaudio
.portaudio: portaudio .portaudio: portaudio
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && make && make install cd $< && $(MAKE) && $(MAKE) install
touch $@ touch $@
...@@ -18,6 +18,6 @@ regex: regex-$(REGEX_VERSION).tar.gz .sum-regex ...@@ -18,6 +18,6 @@ regex: regex-$(REGEX_VERSION).tar.gz .sum-regex
.regex: regex .regex: regex
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) 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 cd $< && $(AR) rcvu libregex.a regex.o && $(RANLIB) libregex.a && cp -v regex.h $(PREFIX)/include && cp -v libregex.a $(PREFIX)/lib
touch $@ touch $@
...@@ -20,5 +20,5 @@ sqlite: sqlite-$(SQLITE_VERSION).tar.gz .sum-sqlite ...@@ -20,5 +20,5 @@ sqlite: sqlite-$(SQLITE_VERSION).tar.gz .sum-sqlite
.sqlite: sqlite .sqlite: sqlite
cd $< && $(HOSTVARS) ./configure $(HOSTCONF) cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
cd $< && make && make install cd $< && $(MAKE) && $(MAKE) install
touch $@ touch $@
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment