Patch to Makefile.am

[Floris Kraak <floris snow nl>]

Hi,

Attached patch fixes a small problem in Makefile.am
Applying this will make it easier to use automake 1.5 and beyond
when building gnumeric.

The reason for this is that automake seems to want only
one declaration of gnumeric_version within a conditional.
The patch seperates the -bonobo version into the WITH_BONOBO
conditional, thus solving the issue.

Applies to 1.0.x and recent CVS HEAD

P.S. We also have a patch that fixes gnome_common to use
automake 1.5, but it seems there needs to be an argument
resolved first ..

Regards,
Floris Kraak
-- 
A box without hinges, key, or lid,
Yet golden treasure inside is hid.
                -- J.R.R. Tolkien

Index: gnumeric/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnumeric/Makefile.am,v
retrieving revision 1.75
diff -u -r1.75 Makefile.am
--- gnumeric/Makefile.am        17 Sep 2002 16:43:17 -0000      1.75
+++ gnumeric/Makefile.am        11 Dec 2002 14:04:10 -0000
@@ -36,10 +36,9 @@
        intltool-update.in      \
        $(server_in_files)
 
-if WITH_BONOBO
-gnumeric_version="$(VERSION)-bonobo"
-else
 gnumeric_version="$(VERSION)"
+if WITH_BONOBO
+gnumeric_version+="-bonobo"
 endif
 
 gnumeric.keys: gnumeric.keys.in Makefile
Index: gnumeric/src/dialogs/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnumeric/src/dialogs/Makefile.am,v
retrieving revision 1.90
diff -u -r1.90 Makefile.am
--- gnumeric/src/dialogs/Makefile.am    6 Nov 2002 21:58:34 -0000       1.90
+++ gnumeric/src/dialogs/Makefile.am    11 Dec 2002 14:04:19 -0000
@@ -2,13 +2,12 @@
 # Keep this in sync with ../../icons/Makefile.am
 #
 
-if WITH_BONOBO
-gnumeric_version="$(VERSION)-bonobo"
-libdialogs_a_SOURCES = $(base_files)
-else
 gnumeric_version="$(VERSION)"
 libdialogs_a_SOURCES = $(base_files)
+if WITH_BONOBO
+gnumeric_version+="-bonobo"
 endif
+
 gnumeric_libdir = $(datadir)/gnumeric/$(gnumeric_version)
 
 INCLUDES =                                                             \