forked from lix-project/lix
* It seems that svnversion prints a carriage return on Cygwin, so we
get a invalid #define VERSION. Use "svnversion -n" to leave out the newline. Fix provided by Marc Weber.
This commit is contained in:
parent
ae7990cc88
commit
2716f9bc5f
|
@ -9,14 +9,14 @@ STABLE=0
|
||||||
|
|
||||||
# Put the revision number in the version.
|
# Put the revision number in the version.
|
||||||
if test "$STABLE" != "1"; then
|
if test "$STABLE" != "1"; then
|
||||||
if REVISION=`test -d $srcdir/.svn && svnversion $srcdir 2> /dev/null`; then
|
if REVISION=`test -d $srcdir/.svn && svnversion -n $srcdir 2> /dev/null`; then
|
||||||
VERSION=${VERSION}pre${REVISION}
|
VERSION=${VERSION}pre${REVISION}
|
||||||
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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_DEFINE_UNQUOTED(NIX_VERSION, ["$(echo $VERSION)"], [version])
|
AC_DEFINE_UNQUOTED(NIX_VERSION, ["$VERSION"], [version])
|
||||||
|
|
||||||
AC_PREFIX_DEFAULT(/nix)
|
AC_PREFIX_DEFAULT(/nix)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue