Removed branch information. stable-1.4
authorFlorian Pose <fp@igh-essen.com>
Fri, 17 Oct 2008 13:18:25 +0000
branchstable-1.4
changeset 1651 9377a006907f
parent 1650 32abac820eaf
child 1652 df31116073f6
Removed branch information.
Makefile.am
configure.ac
globals.h
--- a/Makefile.am	Fri Oct 17 13:16:50 2008 +0000
+++ b/Makefile.am	Fri Oct 17 13:18:25 2008 +0000
@@ -73,7 +73,7 @@
 	svn2cl $(srcdir)
 	@SVNREV=`svnversion $(srcdir)` && \
 	  $(MAKE) dist-bzip2 \
-	  distdir=$(PACKAGE)-$(VERSION)-$(BRANCH)-r$${SVNREV}
+	  distdir=$(PACKAGE)-$(VERSION)-r$${SVNREV}
 
 dist-hook:
 	if which svnversion >/dev/null 2>&1; then \
--- a/configure.ac	Fri Oct 17 13:16:50 2008 +0000
+++ b/configure.ac	Fri Oct 17 13:18:25 2008 +0000
@@ -14,11 +14,6 @@
 # Global
 #------------------------------------------------------------------------------
 
-branch=stable
-
-AC_DEFINE_UNQUOTED(BRANCH, ["$branch"], [Subversion branch])
-AC_SUBST(BRANCH, [$branch])
-
 AC_PROG_CXX
 
 #------------------------------------------------------------------------------
--- a/globals.h	Fri Oct 17 13:16:50 2008 +0000
+++ b/globals.h	Fri Oct 17 13:18:25 2008 +0000
@@ -61,7 +61,7 @@
 
 /** Master version string
  */
-#define EC_MASTER_VERSION VERSION " " BRANCH " r" EC_STR(SVNREV)
+#define EC_MASTER_VERSION VERSION " r" EC_STR(SVNREV)
 
 /*****************************************************************************/