forked from lix-project/lix
* Revert r1594 - it didn't solve the problem. Instead add
svn-revision to distributions, which should fix it.
This commit is contained in:
parent
2248becfd3
commit
3ade3e7721
|
@ -1,5 +1,5 @@
|
|||
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
|
||||
|
||||
|
@ -33,3 +33,6 @@ init-state:
|
|||
else
|
||||
init-state:
|
||||
endif
|
||||
|
||||
svn-revision:
|
||||
svnversion . > svn-revision
|
||||
|
|
|
@ -14,8 +14,6 @@ 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)
|
||||
|
|
|
@ -7,5 +7,5 @@ AM_CXXFLAGS = \
|
|||
-DNIX_DATA_DIR=\"$(datadir)\" \
|
||||
-DNIX_STATE_DIR=\"$(localstatedir)/nix\" \
|
||||
-DNIX_LOG_DIR=\"$(localstatedir)/log/nix\" \
|
||||
-DNIX_VERSION=\"$(NIX_VERSION)\" \
|
||||
-DNIX_VERSION=\"$(VERSION)\" \
|
||||
-I.. ${aterm_include} -I../libutil -I../libstore
|
||||
|
|
Loading…
Reference in a new issue