TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Revert r1594 - it didn't solve the problem. Instead add 

svn-revision to distributions, which should fix it.
This commit is contained in:
Eelco Dolstra 2004-10-25 13:51:34 +00:00
parent 2248becfd3
commit 3ade3e7721
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -1,5 +1,5 @@
SUBDIRS = externals src scripts corepkgs doc misc tests SUBDIRS = externals src scripts corepkgs doc misc tests
EXTRA_DIST = substitute.mk nix.spec nix.spec.in bootstrap.sh EXTRA_DIST = substitute.mk nix.spec nix.spec.in bootstrap.sh svn-revision
include ./substitute.mk include ./substitute.mk
@ -33,3 +33,6 @@ init-state:
else else
init-state: init-state:
endif endif
svn-revision:
svnversion . > svn-revision

2
configure.ac
View File

@ -14,8 +14,6 @@ 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)

2
src/libmain/Makefile.am
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=\"$(NIX_VERSION)\" \ -DNIX_VERSION=\"$(VERSION)\" \
-I.. ${aterm_include} -I../libutil -I../libstore -I.. ${aterm_include} -I../libutil -I../libstore