[SCM] libav/experimental: use MAKE variable

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:29:50 UTC 2013


The following commit has been merged in the experimental branch:
commit 2cc8ae967620f4d4a21eb61c775568dd4c810881
Author: Fabrice Bellard <fabrice at bellard.org>
Date:   Sat Aug 11 18:57:27 2001 +0000

    use MAKE variable
    
    
    Originally committed as revision 63 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/Makefile b/Makefile
index ffa1b80..a8f3416 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 5109376..d7769e2 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

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list