From 8d925ec2543a57ea48dad576b00bd14dbc4c817e Mon Sep 17 00:00:00 2001 From: Ron <ron@debian.org> Date: Sat, 11 May 2013 07:33:03 +0930 Subject: [PATCH] Don't fail hard if package_version does not exist There's currently at least one way that people can legitimately get a tarball that doesn't include it, via the gitweb snapshots, so create it rather than considering that an error to be manually fixed. --- Makefile.am | 3 +++ Makefile.unix | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index e22abfa57..b128541f7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -171,6 +171,9 @@ $(top_srcdir)/configure.ac: force dist-* | dist | distcheck | distclean) _arg=release ;; \ esac; \ if ! $(top_srcdir)/update_version $$_arg 2> /dev/null; then \ + if [ ! -e $(top_srcdir)/package_version ]; then \ + echo 'PACKAGE_VERSION="unknown"' > $(top_srcdir)/package_version; \ + fi; \ . $(top_srcdir)/package_version || exit 1; \ [ "$(PACKAGE_VERSION)" != "$$PACKAGE_VERSION" ] || exit 0; \ fi; \ diff --git a/Makefile.unix b/Makefile.unix index 84244bf77..7d37995d5 100644 --- a/Makefile.unix +++ b/Makefile.unix @@ -116,7 +116,11 @@ celt/celt.o: CFLAGS += -DPACKAGE_VERSION='$(PACKAGE_VERSION)' celt/celt.o: package_version package_version: force - @./update_version || true + @if [ -x ./update_version ]; then \ + ./update_version || true; \ + elif [ ! -e ./package_version ]; then \ + echo 'PACKAGE_VERSION="unknown"' > ./package_version; \ + fi force: -- GitLab