aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2001-08-11 18:57:27 +0000
committerFabrice Bellard <fabrice@bellard.org>2001-08-11 18:57:27 +0000
commit2cc8ae967620f4d4a21eb61c775568dd4c810881 (patch)
treefac86852ef411a0ecca2e70acf06e19f0c747ac8
parent0c1e384c5f70f6e05af90d9b40f18a8602f4fc84 (diff)
downloadffmpeg-2cc8ae967620f4d4a21eb61c775568dd4c810881.tar.gz
use MAKE variable
Originally committed as revision 63 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile8
-rwxr-xr-xconfigure1
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