Changeset 585

Timestamp:

Apr 11, 2008, 11:37:36 PM (15 years ago)

Author:

Peter Johansson

Message:

replacing SPLIT_VERSION macro with version.m4 taken from yat project

Location:

trunk

Files:

• bin/Makefile.am (modified) (1 diff)
• build_support/svndigest.m4 (deleted)
• build_support/version.m4 (added)
• configure.ac (modified) (2 diffs)

trunk/bin/Makefile.am

@@ -38 +38 @@
   cd $(DESTDIR)$(bindir) && \
   mv -f svndigest$(EXEEXT) \
-  svndigest-$(VERSION_MAJOR).$(VERSION_MINOR)$(EXEEXT) && \
-  $(LN_S) svndigest-$(VERSION_MAJOR).$(VERSION_MINOR)$(EXEEXT) svndigest$(EXEEXT)
+  svndigest-$(MAJOR_VERSION).$(MINOR_VERSION)$(EXEEXT) && \
+  $(LN_S) svndigest-$(MAJOR_VERSION).$(MINOR_VERSION)$(EXEEXT) svndigest$(EXEEXT)
+
+uninstall-hook:
+  cd $(DESTDIR)$(bindir) && \
+  rm -f svndigest-$(MAJOR_VERSION).$(MINOR_VERSION)$(EXEEXT)
 
 clean-local: 

trunk/configure.ac

@@ -35 +35 @@
 
 
-AC_INIT([svndigest],[pre0.7],[jari@thep.lu.se])
+m4_include([./build_support/version.m4])
+AC_INIT([svndigest],[SVNDIGEST_VERSION],[jari@thep.lu.se])
 AC_CONFIG_SRCDIR([lib/File.h])
 AC_CONFIG_AUX_DIR([autotools])
@@ -41 +42 @@
 test $prefix = NONE && prefix=/usr/local
 
+AC_SUBST([SVNDIGEST_MAJOR_VERSION], [MAJOR_VERSION])
+AC_SUBST([SVNDIGEST_MINOR_VERSION], [MINOR_VERSION])
+AC_SUBST([SVNDIGEST_PATCH_VERSION], [PATCH_VERSION])
+
+AC_DEFINE([DEV_BUILD],[SVNDIGEST_DEV_BUILD], 
+          [true if dev build (version starts with pre)])
+AC_DEFINE([VERSION_MAJOR], [SVNDIGEST_MAJOR_VERSION], 
+                    [Define to the svndigest major version])
+AC_DEFINE([VERSION_MINOR], [SVNDIGEST_MINOR_VERSION],
+                    [Define to the svndigest minor version])
+AC_DEFINE([VERSION_PATCH], [SVNDIGEST_PATCH_VERSION],
+                    [Define to the svndigest patch version])
+
 AC_CONFIG_HEADER([config.h])
 AM_INIT_AUTOMAKE([std-options check-news])
-
-sinclude(./build_support/svndigest.m4)
-SPLIT_VERSION([VERSION], [$VERSION])
 
 # seems like these variables are not set with older autoconf(?)