* Make sure that the prerelease version is included in `--version'.

This commit is contained in:
Eelco Dolstra 2004-10-25 12:15:50 +00:00
parent 50b9caac14
commit 2248becfd3
2 changed files with 3 additions and 1 deletions

View file

@ -14,6 +14,8 @@ if test "$STABLE" != "1"; then
elif REVISION=`cat $srcdir/svn-revision 2> /dev/null`; then elif REVISION=`cat $srcdir/svn-revision 2> /dev/null`; then
VERSION="${VERSION}pre${REVISION}" VERSION="${VERSION}pre${REVISION}"
fi fi
NIX_VERSION=$VERSION
AC_SUBST(NIX_VERSION)
fi fi
AC_PREFIX_DEFAULT(/nix) AC_PREFIX_DEFAULT(/nix)

View file

@ -7,5 +7,5 @@ AM_CXXFLAGS = \
-DNIX_DATA_DIR=\"$(datadir)\" \ -DNIX_DATA_DIR=\"$(datadir)\" \
-DNIX_STATE_DIR=\"$(localstatedir)/nix\" \ -DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
-DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \ -DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
-DNIX_VERSION=\"$(VERSION)\" \ -DNIX_VERSION=\"$(NIX_VERSION)\" \
-I.. ${aterm_include} -I../libutil -I../libstore -I.. ${aterm_include} -I../libutil -I../libstore