diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2013-02-15 13:00:02 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2013-02-15 13:00:02 +0000 |
| commit | 1549809d7dac108c35a6f04acb0c6fa535597843 (patch) | |
| tree | 7ac3a6553d9f48a448b2411037f2e5ea96a277c9 | |
| parent | f42ff3194110b8d2f16b234470e4cce1e4c13de7 (diff) | |
Fix 'make dist'
This time for real hopefully. Make sure to remove any
libav-dist directories that may still be around from
previous make dist attempts first.
| -rw-r--r-- | gst-libs/ext/Makefile.am | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am index cbd1274..12f35c8 100644 --- a/gst-libs/ext/Makefile.am +++ b/gst-libs/ext/Makefile.am @@ -23,7 +23,7 @@ clean-local: dist-clean: cd libav && $(MAKE) distclean - rm -rf $(TMP_DIST_DIR) + rm -rf libav/$(TMP_DIST_DIR) rm -f Makefile rm -f libav/.version rm -f libav/.config @@ -37,18 +37,18 @@ maintainerclean: maintainer-clean dist-local: GIT_DIR=libav/.git git checkout-index --prefix=$(TMP_DIST_DIR)/libav/ -a - touch $(TMP_DIST_DIR)/libav/config.mak + touch libav/$(TMP_DIST_DIR)/libav/config.mak echo "Patching libav ./configure" - sed -e '/Unknown option/ {N;N;s/exit 1//; }' $(TMP_DIST_DIR)/libav/configure > $(TMP_DIST_DIR)/libav/configure.tmp - mv $(TMP_DIST_DIR)/libav/configure.tmp $(TMP_DIST_DIR)/libav/configure - chmod +x $(TMP_DIST_DIR)/libav/configure + sed -e '/Unknown option/ {N;N;s/exit 1//; }' libav/$(TMP_DIST_DIR)/libav/configure > libav/$(TMP_DIST_DIR)/libav/configure.tmp + mv libav/$(TMP_DIST_DIR)/libav/configure.tmp libav/$(TMP_DIST_DIR)/libav/configure + chmod +x libav/$(TMP_DIST_DIR)/libav/configure distdir: dist-local - cp -r $(TMP_DIST_DIR)/libav ${distdir} + cp -r libav/$(TMP_DIST_DIR)/libav ${distdir} cp -f $(top_srcdir)/gst-libs/ext/Makefile.am $(top_srcdir)/gst-libs/ext/Makefile.in ${distdir} - rm -rf $(TMP_DIST_DIR) + rm -rf libav/$(TMP_DIST_DIR) dist: dist-local - cd $(TMP_DIST_DIR) && tar -czf libav.tar.gz libav - mv $(TMP_DIST_DIR)/libav.tar.gz ./ - rm -rf $(TMP_DIST_DIR) + cd libav/$(TMP_DIST_DIR) && tar -czf libav.tar.gz libav + mv libav/$(TMP_DIST_DIR)/libav.tar.gz ./ + rm -rf libav/$(TMP_DIST_DIR) |