From 2248becfd3363a5de52ef6b10edf4c2d774bfa1e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon, 25 Oct 2004 12:15:50 +0000
Subject: [PATCH] * Make sure that the prerelease version is included in
`--version'.
---
configure.ac | 2 ++
src/libmain/Makefile.am | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index 2ba8e9238..b4dd93c4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,8 @@ if test "$STABLE" != "1"; then
elif REVISION=`cat $srcdir/svn-revision 2> /dev/null`; then
VERSION="${VERSION}pre${REVISION}"
fi
+ NIX_VERSION=$VERSION
+ AC_SUBST(NIX_VERSION)
fi
AC_PREFIX_DEFAULT(/nix)
diff --git a/src/libmain/Makefile.am b/src/libmain/Makefile.am
index 3c28441ca..e326b8421 100644
--- a/src/libmain/Makefile.am
+++ b/src/libmain/Makefile.am
@@ -7,5 +7,5 @@ AM_CXXFLAGS = \
-DNIX_DATA_DIR=\"$(datadir)\" \
-DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
-DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
- -DNIX_VERSION=\"$(VERSION)\" \
+ -DNIX_VERSION=\"$(NIX_VERSION)\" \
-I.. ${aterm_include} -I../libutil -I../libstore
--
GitLab