From 4e7d5286d46fa515d44607e4618f46662a0bf41d Mon Sep 17 00:00:00 2001
From: Florian Pose <fp@igh-essen.com>
Date: Mon, 1 Sep 2008 14:21:42 +0000
Subject: [PATCH] Removed branch information.
---
Makefile.am | 2 +-
configure.ac | 5 -----
globals.h | 2 +-
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 0bbfaaf3..6e4847fc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,7 +71,7 @@ mydist:
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 \
diff --git a/configure.ac b/configure.ac
index d23cfc1f..672e616f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,11 +14,6 @@ AC_CONFIG_SRCDIR([config.h.in])
# Global
#------------------------------------------------------------------------------
-branch=trunk
-
-AC_DEFINE_UNQUOTED(BRANCH, ["$branch"], [Subversion branch])
-AC_SUBST(BRANCH, [$branch])
-
AC_PROG_CXX
#------------------------------------------------------------------------------
diff --git a/globals.h b/globals.h
index acf8915e..f149e72e 100644
--- a/globals.h
+++ b/globals.h
@@ -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)
/*****************************************************************************/
--
GitLab