build: Rename version.h to ctdb_version.h

This avoids clash with version.h from Samba tree.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/Makefile.in b/Makefile.in
index 80acfd5b945c8153b935f5534581c3a0e9b08caf..9f94aee79295587ee8b92a6fa4b192c3c3ade003 100755 (executable)
--- a/Makefile.in
+++ b/Makefile.in
@@ -63,7 +63,7 @@ SHLD=${CC} ${CFLAGS} ${LDSHFLAGS} -o $@
 LIB_FLAGS=@LDFLAGS@ -Llib @LIBS@ $(POPT_LIBS) $(TALLOC_LIBS) $(TEVENT_LIBS) $(TDB_LIBS) \
                  @INFINIBAND_LIBS@ @CTDB_PCAP_LDFLAGS@
 
-CTDB_VERSION_H = include/version.h
+CTDB_VERSION_H = include/ctdb_version.h
 
 UTIL_OBJ = lib/util/idtree.o lib/util/db_wrap.o lib/util/strlist.o lib/util/util.o \
        lib/util/util_time.o lib/util/util_file.o lib/util/fault.o lib/util/substitute.o \

diff --git a/packaging/RPM/makerpms.sh b/packaging/RPM/makerpms.sh
index c216185cca41513c195513267cd0fc716114aed1..d3bda525f5bd89233caff1fa7b5a8779fdeef18b 100755 (executable)
--- a/packaging/RPM/makerpms.sh
+++ b/packaging/RPM/makerpms.sh
@@ -52,7 +52,7 @@ mkdir -p `rpm --eval %_rpmdir`/noarch
 mkdir -p `rpm --eval %_rpmdir`/i386
 mkdir -p `rpm --eval %_rpmdir`/x86_64
 
-VERSION=$(${TOPDIR}/packaging/mkversion.sh ${TOPDIR}/include/version.h)
+VERSION=$(${TOPDIR}/packaging/mkversion.sh ${TOPDIR}/include/ctdb_version.h)
 if [ -z "$VERSION" ]; then
     exit 1
 fi

diff --git a/packaging/maketarball.sh b/packaging/maketarball.sh
index c3fe23bc6cf3710f3f80ceaf2ba17fce88942286..be1986932594599eba2961583792de4faf81ba35 100755 (executable)
--- a/packaging/maketarball.sh
+++ b/packaging/maketarball.sh
@@ -35,7 +35,7 @@ fi
 TAR_PREFIX_TMP="ctdb-tmp"
 SPECFILE=/tmp/${TAR_PREFIX_TMP}/packaging/RPM/ctdb.spec
 SPECFILE_IN=${SPECFILE}.in
-VERSION_H=/tmp/${TAR_PREFIX_TMP}/include/version.h
+VERSION_H=/tmp/${TAR_PREFIX_TMP}/include/ctdb_version.h
 
 if echo | gzip -c --rsyncable - > /dev/null 2>&1 ; then
        GZIP="gzip -9 --rsyncable"

diff --git a/packaging/mkversion.sh b/packaging/mkversion.sh
index 18b432a30a195d6ea05cadc473df17dcbe5257a8..4a80b253045766d2f8797791ee1ad5cb57834bc2 100755 (executable)
--- a/packaging/mkversion.sh
+++ b/packaging/mkversion.sh
@@ -25,7 +25,7 @@
 OUTPUT=$1
 
 if [ -z "$OUTPUT" ]; then
-    OUTPUT="include/version.h"
+    OUTPUT="include/ctdb_version.h"
 fi
 
 # We use tags and determine the version, as follows:

diff --git a/tools/ctdb.c b/tools/ctdb.c
index bf798012fa25146aed461c21dcf5dc378608ec0a..7e3e013f3e3410054b108617d5af22b1e03cbcc5 100644 (file)
--- a/tools/ctdb.c
+++ b/tools/ctdb.c
@@ -25,7 +25,7 @@
 #include "system/locale.h"
 #include "popt.h"
 #include "cmdline.h"
-#include "../include/version.h"
+#include "../include/ctdb_version.h"
 #include "../include/ctdb.h"
 #include "../include/ctdb_client.h"
 #include "../include/ctdb_private.h"