diff options
| author | Guillem Jover <guillem@debian.org> | 2018-09-28 01:48:32 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2018-10-08 10:53:08 +0200 |
| commit | 1e618ad140e24441a7ebdbfe0c4822aa0e06118c (patch) | |
| tree | d30d4602150f798416ad5d6981b565793f76aff6 | |
| parent | 13c1c95323beebfba21ad8e4e56e7c110089929d (diff) | |
| download | dpkg-1e618ad140e24441a7ebdbfe0c4822aa0e06118c.tar.gz | |
build: Generalize PACKAGE_CPAN_SIGN by setting PACKAGE_DIST_IS_RELEASE instead
Set the more generic name from within DPKG_DIST_IS_RELEASE, and use that
directly in the Build.PL.in file.
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | m4/dpkg-build.m4 | 6 | ||||
| -rw-r--r-- | scripts/Build.PL.in | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 121c7665a..9ba198104 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,6 @@ AC_SUBST([PACKAGE_VCS_URL], [https://git.dpkg.org/git/dpkg/dpkg.git]) AC_SUBST([PACKAGE_VCS_WEB], [https://git.dpkg.org/cgit/dpkg/dpkg.git]) AC_SUBST([PACKAGE_BUG_WEB], [https://bugs.debian.org/src:dpkg]) AC_SUBST([PACKAGE_CPAN_NAME], [Dpkg]) -AC_SUBST([PACKAGE_CPAN_SIGN], [$dpkg_dist_is_release]) AC_CONFIG_SRCDIR([lib/dpkg/dpkg.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) diff --git a/debian/changelog b/debian/changelog index 64f85b002..a01776335 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ dpkg (1.19.2) UNRELEASED; urgency=medium * Build system: - Distribute a LICENSE file on CPAN. - Do not make the Build.PL script executable. + - Generalize PACKAGE_CPAN_SIGN by setting PACKAGE_DIST_IS_RELEASE instead. [ Updated programs translations ] * Polish (Łukasz Dulny). diff --git a/m4/dpkg-build.m4 b/m4/dpkg-build.m4 index 5b98849c3..bd8a2e68f 100644 --- a/m4/dpkg-build.m4 +++ b/m4/dpkg-build.m4 @@ -86,7 +86,8 @@ AC_DEFUN([DPKG_DEB_COMPRESSOR], [ # DPKG_DIST_IS_RELEASE() # -------------------- -# Check whether we are preparing a distribution tarball for a release. +# 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], [ @@ -95,6 +96,9 @@ AC_DEFUN([DPKG_DIST_IS_RELEASE], [ 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]) ])# DPKG_DIST_IS_RELEASE # DPKG_DIST_CHECK(COND, ERROR) diff --git a/scripts/Build.PL.in b/scripts/Build.PL.in index 15a53e90e..b720d23ab 100644 --- a/scripts/Build.PL.in +++ b/scripts/Build.PL.in @@ -80,7 +80,7 @@ my $build = $class->new( keywords => [ qw(dpkg debian perl) ], }, - sign => @PACKAGE_CPAN_SIGN@, + sign => @PACKAGE_DIST_IS_RELEASE@, dynamic_config => 0, configure_requires => { |