about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2004-10-25T12·15+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-10-25T12·15+0000
commit2248becfd3363a5de52ef6b10edf4c2d774bfa1e (patch)
tree2363473c227d5a47de614372cba3b4f01fb14588
parent50b9caac14bff656b6705efbb09e15ba9dc22d22 (diff)
* Make sure that the prerelease version is included in `--version'.
-rw-r--r--configure.ac2
-rw-r--r--src/libmain/Makefile.am2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 2ba8e92384a9..b4dd93c4a367 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 3c28441ca166..e326b84217e8 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