diff --git a/Makefile.am b/Makefile.am index 0bbfaaf3cee9e3d58f3d10aac018a185b3d29711..6e4847fc90d0c930ce6a39c1cf6c85e19b6570b3 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 d23cfc1f30f99fd84f2ae29be42549aee3a3e398..672e616f1806ecd8122e2603b3742eaab954f351 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 acf8915e2a424afb4839dca0a3e983f53db7c848..f149e72ebe7507058ca83e4111f73d0bcb0e0647 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) /*****************************************************************************/