diff options
| author | Guillem Jover <guillem@debian.org> | 2019-02-20 11:48:08 +0100 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2019-02-23 14:21:53 +0100 |
| commit | c4e8529c7dd3c5ead87b8e8c5a6e5c83093c72de (patch) | |
| tree | 4033231592fdb2c8fe1b386fa13774f67cabb814 /m4/dpkg-build.m4 | |
| parent | 42bf881455ddf31607c3acf7b0769cbfad2bdcf5 (diff) | |
| download | dpkg-c4e8529c7dd3c5ead87b8e8c5a6e5c83093c72de.tar.gz | |
build: Check whether this dist is a release based only on the version format
Using the .dist-version file implies that we need to do a two staged
release process. First a «make dist», unpack the generated tarball
distribution, and run that again. When the deciding factor is the
format of the version. Switch to use that exclusively.
Diffstat (limited to 'm4/dpkg-build.m4')
| -rw-r--r-- | m4/dpkg-build.m4 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/m4/dpkg-build.m4 b/m4/dpkg-build.m4 index bd8a2e68f..d73db9907 100644 --- a/m4/dpkg-build.m4 +++ b/m4/dpkg-build.m4 @@ -89,13 +89,11 @@ AC_DEFUN([DPKG_DEB_COMPRESSOR], [ # Check whether we are preparing a distribution tarball for a release, and # set PACKAGE_DIST_IS_RELEASE accordingly. AC_DEFUN([DPKG_DIST_IS_RELEASE], [ - dpkg_dist_version=$srcdir/.dist-version - AS_IF([test -f $dpkg_dist_version && grep -q -v '[-]' $dpkg_dist_version], [ + AS_IF([echo $PACKAGE_VERSION | grep -q -v '[-]'], [ dpkg_dist_is_release=1 ], [ dpkg_dist_is_release=0 ]) - unset dpkg_dist_version AM_CONDITIONAL([PACKAGE_DIST_IS_RELEASE], [test "$dpkg_dist_is_release" -eq 1]) AC_SUBST([PACKAGE_DIST_IS_RELEASE], [$dpkg_dist_is_release]) |