shithub: opus

Info  •  Files  •  Log  •  Branches

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.

--- a/Makefile.am

+++ b/Makefile.am

@@ -171,6 +171,9 @@

 	    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; \

--- a/Makefile.unix

+++ b/Makefile.unix

@@ -116,7 +116,11 @@

 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: