diff options
| author | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2009-01-27 21:10:53 +0100 |
|---|---|---|
| committer | Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> | 2009-01-28 13:02:54 +0100 |
| commit | 39ea52832d906602e5dc0862f7ec2b513ec28f01 (patch) | |
| tree | 265352bfbfdf8a73ebb2592e47d25f4ce52ac803 /gst-libs | |
| parent | 1d1f55edf7ff2ae7324b5c5aac2c443dfd5436c3 (diff) | |
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.
Diffstat (limited to 'gst-libs')
| -rw-r--r-- | gst-libs/ext/Makefile.am | 22 |
1 files changed, 11 insertions, 11 deletions
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) |