summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--release.nix8
2 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index a6c8ba6..bdda1a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([patchelf], m4_esyscmd([echo -n $(cat ./version)$VERSION_SUFFIX]))
+AC_INIT([patchelf], m4_esyscmd([echo -n $(cat ./version)]))
AC_CONFIG_SRCDIR([src/patchelf.cc])
AC_CONFIG_AUX_DIR([build-aux])
AM_INIT_AUTOMAKE([-Wall -Werror dist-bzip2 foreign color-tests parallel-tests])
diff --git a/release.nix b/release.nix
index dc56eab..f871e99 100644
--- a/release.nix
+++ b/release.nix
@@ -11,12 +11,12 @@ let
tarball =
- pkgs.releaseTools.sourceTarball {
+ pkgs.releaseTools.sourceTarball rec {
name = "patchelf-tarball";
- version = builtins.readFile ./version;
- versionSuffix = if officialRelease then "" else "pre${toString patchelfSrc.revCount}_${patchelfSrc.shortRev}";
+ version = builtins.readFile ./version + (if officialRelease then "" else "pre${toString patchelfSrc.revCount}_${patchelfSrc.shortRev}");
+ versionSuffix = ""; # obsolete
src = patchelfSrc;
- inherit officialRelease;
+ preAutoconf = "echo ${version} > version";
postDist = ''
cp README $out/
echo "doc readme $out/README" >> $out/nix-support/hydra-build-products