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.
This commit is contained in:
Rico Tzschichholz 2013-02-15 13:00:02 +00:00 committed by Tim-Philipp Müller
parent f42ff31941
commit 1549809d7d

View file

@ -23,7 +23,7 @@ clean-local:
dist-clean: dist-clean:
cd libav && $(MAKE) distclean cd libav && $(MAKE) distclean
rm -rf $(TMP_DIST_DIR) rm -rf libav/$(TMP_DIST_DIR)
rm -f Makefile rm -f Makefile
rm -f libav/.version rm -f libav/.version
rm -f libav/.config rm -f libav/.config
@ -37,18 +37,18 @@ maintainerclean: maintainer-clean
dist-local: dist-local:
GIT_DIR=libav/.git git checkout-index --prefix=$(TMP_DIST_DIR)/libav/ -a 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" echo "Patching libav ./configure"
sed -e '/Unknown option/ {N;N;s/exit 1//; }' $(TMP_DIST_DIR)/libav/configure > $(TMP_DIST_DIR)/libav/configure.tmp sed -e '/Unknown option/ {N;N;s/exit 1//; }' libav/$(TMP_DIST_DIR)/libav/configure > libav/$(TMP_DIST_DIR)/libav/configure.tmp
mv $(TMP_DIST_DIR)/libav/configure.tmp $(TMP_DIST_DIR)/libav/configure mv libav/$(TMP_DIST_DIR)/libav/configure.tmp libav/$(TMP_DIST_DIR)/libav/configure
chmod +x $(TMP_DIST_DIR)/libav/configure chmod +x libav/$(TMP_DIST_DIR)/libav/configure
distdir: dist-local 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} 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 dist: dist-local
cd $(TMP_DIST_DIR) && tar -czf libav.tar.gz libav cd libav/$(TMP_DIST_DIR) && tar -czf libav.tar.gz libav
mv $(TMP_DIST_DIR)/libav.tar.gz ./ mv libav/$(TMP_DIST_DIR)/libav.tar.gz ./
rm -rf $(TMP_DIST_DIR) rm -rf libav/$(TMP_DIST_DIR)