Changeset 646 for branches/replacing_gnuplot/build_support

Timestamp:

Jun 4, 2008, 12:05:22 AM (15 years ago)

Author:

Jari Häkkinen

Message:

Merged trunk changes r608:645 to replacing_gnuplot branch.

Location:

branches/replacing_gnuplot/build_support

Files:

• move-if-change (modified) (1 prop)
• version.m4 (modified) (3 diffs)

branches/replacing_gnuplot/build_support/version.m4

@@ -1 +1 @@
 ## $Id$
 #
-# Copyright (C) 2008 Peter Johansson
+# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
 #
 # This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -31 +31 @@
 m4_define([PATCH_VERSION], [0])
 
-# DEV_BUILD - When rolling a tarball we set this to `false'. In
+# SVNDIGEST_DEV_BUILD - When rolling a tarball we set this to `false'. In
 # repository value remains `true'.
 m4_define([SVNDIGEST_DEV_BUILD], [true])
@@ -45 +45 @@
 m4_define([SVNDIGEST_VERSION], m4_if(PATCH_VERSION,[0], SVNDIGEST_VERSION,
                                   SVNDIGEST_VERSION.PATCH_VERSION))
-m4_define([SVNDIGEST_VERSION], m4_if(DEV_BUILD,[true], [pre]SVNDIGEST_VERSION,
-                                  SVNDIGEST_VERSION))
+m4_define([SVNDIGEST_VERSION], m4_if(SVNDIGEST_DEV_BUILD,
+                                    [true], [pre]SVNDIGEST_VERSION,
+                                    SVNDIGEST_VERSION))