From 2cc8ae967620f4d4a21eb61c775568dd4c810881 Mon Sep 17 00:00:00 2001 From: Fabrice Bellard Date: Sat, 11 Aug 2001 18:57:27 +0000 Subject: [PATCH] use MAKE variable Originally committed as revision 63 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 8 ++++---- configure | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index ffa1b80a14..a8f341620c 100644 --- a/Makefile +++ b/Makefile @@ -15,8 +15,8 @@ PROG= ffmpeg ffserver all: lib $(PROG) lib: - make -C libavcodec all - make -C libav all + $(MAKE) -C libavcodec all + $(MAKE) -C libav all ffmpeg: ffmpeg.o libav/libav.a libavcodec/libavcodec.a gcc $(LDFLAGS) -o $@ $^ -lm @@ -31,8 +31,8 @@ install: all install -s -m 755 $(PROG) $(prefix)/bin clean: - make -C libavcodec clean - make -C libav clean + $(MAKE) -C libavcodec clean + $(MAKE) -C libav clean rm -f *.o *~ gmon.out TAGS $(PROG) distclean: clean diff --git a/configure b/configure index 5109376c30..d7769e21fe 100755 --- a/configure +++ b/configure @@ -68,6 +68,7 @@ if test -z "$CFLAGS"; then fi echo "prefix=$prefix" >> config.mak +echo "MAKE=make" >> config.mak echo "CC=$cc" >> config.mak echo "AR=$ar" >> config.mak echo "OPTFLAGS=$CFLAGS" >> config.mak