From: Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Date: Tue, 27 Jan 2009 20:10:53 +0000 (+0100)
Subject: Do not corrupt ffmpeg build checkout during make dist.
X-Git-Tag: RELEASE-0_10_7~60
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39ea52832d906602e5dc0862f7ec2b513ec28f01;p=platform%2Fupstream%2Fgst-libav.git

Do not corrupt ffmpeg build checkout during make dist.

Use a separate helper directory to build ffmpeg distributables
rather than replacing and corrupting (no more .svn dirs)
the existing checkout used for standard make/building.
---

diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
index e4f8031..915a16f 100644
--- a/gst-libs/ext/Makefile.am
+++ b/gst-libs/ext/Makefile.am
@@ -44,20 +44,20 @@ dist-local:
 			cp $(TMP_DIST_DIR)/$$d$$id/*.c $(TMP_DIST_DIR)/$$d$$id/*.h $(TMP_DIST_DIR)/$$d$$id/*.asm $(TMP_DIST_DIR)/$$d$$id/*.S $(DIST_DIR)/$$d$$id; \
 			done \
 		fi \
-	done 
-	rm -rf ffmpeg
-	mv $(DIST_DIR) ffmpeg
-	touch ffmpeg/config.mak
+	done
+	mv $(DIST_DIR) $(TMP_DIST_DIR)/ffmpeg
+	touch $(TMP_DIST_DIR)/ffmpeg/config.mak
 	echo "Patching ffmpeg ./configure"
-	sed -e '/Unknown option/ {N;N;s/exit 1//; }' ffmpeg/configure > ffmpeg/configure.tmp
-	mv ffmpeg/configure.tmp ffmpeg/configure
-	chmod +x ffmpeg/configure
-	rm -rf $(TMP_DIST_DIR)
+	sed -e '/Unknown option/ {N;N;s/exit 1//; }' $(TMP_DIST_DIR)/ffmpeg/configure > $(TMP_DIST_DIR)/ffmpeg/configure.tmp
+	mv $(TMP_DIST_DIR)/ffmpeg/configure.tmp $(TMP_DIST_DIR)/ffmpeg/configure
+	chmod +x $(TMP_DIST_DIR)/ffmpeg/configure
 
 distdir: dist-local
-	cp -r ffmpeg ${distdir}
+	cp -r $(TMP_DIST_DIR)/ffmpeg ${distdir}
 	cp -f Makefile.am Makefile.in ${distdir}
+	rm -rf $(TMP_DIST_DIR)
 
 dist: dist-local
-	tar -czf ffmpeg.tar.gz ffmpeg	
-
+	cd $(TMP_DIST_DIR) && tar -czf ffmpeg.tar.gz ffmpeg
+	mv $(TMP_DIST_DIR)/ffmpeg.tar.gz ./
+	rm -rf $(TMP_DIST_DIR)