Many apologies, building from a clean tree generates VERSION and

PACKAGE correctly. Reverting previous commit.

svn path=/trunk/; revision=3448

diff --git a/ChangeLog b/ChangeLog
index 646b878..046773b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-2004-06-04  Richard Kinder  <r_kinder@yahoo.com>
-       * doc-build/gnome-doc-common.in - change @VERSION@, @PACKAGE@
-       to @PACKAGE_VERSION@ and @PACKAGE_NAME@ so things depending on
-       a particular version of gnome-doc-common work.
-
 2004-05-26  James Henstridge  <james@daa.com.au>
 
        * macros2/gnome-compiler-warnings.m4: some small cleanups.

diff --git a/doc-build/gnome-doc-common.in b/doc-build/gnome-doc-common.in
index e319cc7..881122d 100644 (file)
--- a/doc-build/gnome-doc-common.in
+++ b/doc-build/gnome-doc-common.in
@@ -3,8 +3,8 @@
 progname=`echo "$0" | sed 's%^.*/%%'`
 
 PROGRAM=gnome-doc-common
-PACKAGE=@PACKAGE_NAME@
-VERSION=@PACKAGE_VERSION@
+PACKAGE=@PACKAGE@
+VERSION=@VERSION@
 
 prefix=@prefix@
 datadir=@datadir@