summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-13 23:56:00 +0200
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-04-13 23:56:00 +0200
commit7750ea523f4155e1f291479ce237ff968452abe4 (patch)
tree89c064b1d980ecb69c3450c951abda2308fcacab
parente826a74b22188c8c22b77a73c0fa191a5b97f2af (diff)
parentbc45563b549cfe9d513d12f4ed8214cabe2018c9 (diff)
downloadxine-lib-7750ea523f4155e1f291479ce237ff968452abe4.tar.gz
xine-lib-7750ea523f4155e1f291479ce237ff968452abe4.tar.bz2
Merge changes.
-rw-r--r--configure.ac6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 73bade8c9..952c55327 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl XINE_SUB += 1; continue with XINE_LT_* values below
dnl
XINE_MAJOR=1
XINE_MINOR=1
-XINE_SUB=5
+XINE_SUB=6
#if test $XINE_SUB -eq 0 ; then
# XINE_SUBPART="";
@@ -54,8 +54,8 @@ XINE_LT_REVISION=0
XINE_LT_AGE=17
dnl for a release tarball do "rm .cvsversion" before "make dist"
-if test -f "${src_dir}/.cvsversion"; then
- XINE_PRE="cvs"
+if test -f "${srcdir-.}/.cvsversion"; then
+ XINE_PRE="hg"
else
XINE_PRE=""
fi