CVS build fixlet

[Jan Nieuwenhuizen]

Here's a small build fix.

Btw, I had trouble with the project's visibility.  After pulling
gnome-guile blindy from cvs/gnome a few weeks ago, I concluded from
the ChangeLog

    2002-01-03  Ariel Rios  <address@hidden>

that it was dead.  Googling for gnome-guile supported that conclusion.

I'm very happy this is alive.

Greetings,
Jan.

 
Index: gnome/gnome/ChangeLog
===================================================================
RCS file: /cvsroot/guile-gtk/guile-gobject/gnome/gnome/ChangeLog,v
retrieving revision 1.4
diff -p -u -r1.4 ChangeLog
--- gnome/gnome/ChangeLog       11 Feb 2004 13:07:53 -0000      1.4
+++ gnome/gnome/ChangeLog       13 May 2004 13:32:34 -0000
@@ -1,3 +1,7 @@
+2004-05-13  Jan Nieuwenhuizen  <address@hidden>
+
+       * Makefile.am: Use @GUILE@ throughout (WAS: guile).
+
 2004-02-08  Andy Wingo  <address@hidden>
 
        * Makefile.am: Reverted to my local copy.
Index: gnome/gnome/Makefile.am
===================================================================
RCS file: /cvsroot/guile-gtk/guile-gobject/gnome/gnome/Makefile.am,v
retrieving revision 1.6
diff -p -u -r1.6 Makefile.am
--- gnome/gnome/Makefile.am     11 Feb 2004 13:07:53 -0000      1.6
+++ gnome/gnome/Makefile.am     13 May 2004 13:32:34 -0000
@@ -80,7 +80,7 @@ CLEANFILES += guile-gnome-gw-gnome.c gui
 
 gw-gnome.scm guile-gnome-gw-gnome.c guile-gnome-gw-gnome.h: \
        gw-gnome-spec.scm ../defs/gnome.defs ../defs/gnome-overrides.defs
-       guile -c \
+       @GUILE@ -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-gnome-spec.scm\") \
@@ -111,7 +111,7 @@ CLEANFILES += guile-gnome-gw-canvas.c gu
 
 gw-canvas.scm guile-gnome-gw-canvas.c guile-gnome-gw-canvas.h: \
        gw-canvas-spec.scm ../defs/canvas.defs ../defs/canvas-overrides.defs
-       guile -c \
+       @GUILE@ -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-canvas-spec.scm\") \
@@ -142,7 +142,7 @@ CLEANFILES += guile-gnome-gw-ui.c guile-
 
 gw-ui.scm guile-gnome-gw-ui.c guile-gnome-gw-ui.h: \
        gw-ui-spec.scm ../defs/ui.defs ../defs/ui-overrides.defs
-       guile --debug -c \
+       @GUILE@ --debug -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-ui-spec.scm\") \
@@ -170,7 +170,7 @@ CLEANFILES += guile-gnome-gw-vte.c guile
        guile-gnome-gw-vte.log guile-gnome-gw-vte.html gw-vte.scm
 
 gw-vte.scm guile-gnome-gw-vte.c guile-gnome-gw-vte.h: gw-vte-spec.scm 
../defs/vte.defs
-       guile -c \
+       @GUILE@ -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-vte-spec.scm\") \
@@ -202,7 +202,7 @@ CLEANFILES += guile-gnome-gw-source-view
 
 gw-source-view.scm guile-gnome-gw-source-view.c guile-gnome-gw-source-view.h: \
        gw-source-view-spec.scm ../defs/gtksourceview.defs 
../defs/gtksourceview-overrides.defs
-       guile -c \
+       @GUILE@ -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-source-view-spec.scm\") \
Index: gnome/gobject/ChangeLog
===================================================================
RCS file: /cvsroot/guile-gtk/guile-gobject/gnome/gobject/ChangeLog,v
retrieving revision 1.25
diff -p -u -r1.25 ChangeLog
--- gnome/gobject/ChangeLog     3 Apr 2004 10:25:34 -0000       1.25
+++ gnome/gobject/ChangeLog     13 May 2004 13:32:35 -0000
@@ -1,3 +1,7 @@
+2004-05-13  Jan Nieuwenhuizen  <address@hidden>
+
+       * Makefile.am: Use @GUILE@ throughout (WAS: guile).
+
 2004-04-03  Andreas Rottmann  <address@hidden>
 
        * defs-support.scm (type-lookup): Recognize "[]" in type strings
Index: gnome/gobject/Makefile.am
===================================================================
RCS file: /cvsroot/guile-gtk/guile-gobject/gnome/gobject/Makefile.am,v
retrieving revision 1.9
diff -p -u -r1.9 Makefile.am
--- gnome/gobject/Makefile.am   3 Apr 2004 10:25:21 -0000       1.9
+++ gnome/gobject/Makefile.am   13 May 2004 13:32:35 -0000
@@ -130,7 +130,7 @@ GUILE_FLAGS = 
        guile_filter_doc_snarfage --filter-snarfage) > $@ || { rm $@; false; }
 
 gw-gobject.scm guile-gnome-gw-gobject.c guile-gnome-gw-gobject.h: 
gw-gobject-spec.scm
-       guile $(GUILE_FLAGS) -c \
+       @GUILE@ $(GUILE_FLAGS) -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-gobject-spec.scm\") \
@@ -138,7 +138,7 @@ gw-gobject.scm guile-gnome-gw-gobject.c 
        mv guile-gnome-gw-gobject.scm gw-gobject.scm
 
 gw-glib.scm guile-gnome-gw-glib.c guile-gnome-gw-glib.h: gw-glib-spec.scm
-       guile $(GUILE_FLAGS) -c \
+       @GUILE@ $(GUILE_FLAGS) -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-glib-spec.scm\") \
@@ -146,7 +146,7 @@ gw-glib.scm guile-gnome-gw-glib.c guile-
        mv guile-gnome-gw-glib.scm gw-glib.scm
 
 gw-standard.scm guile-gnome-gw-standard.c guile-gnome-gw-standard.h: 
gw-standard-spec.scm
-       guile -c \
+       @GUILE@ -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-standard-spec.scm\") \
Index: gnome/gtk/Makefile.am
===================================================================
RCS file: /cvsroot/guile-gtk/guile-gobject/gnome/gtk/Makefile.am,v
retrieving revision 1.9
diff -p -u -r1.9 Makefile.am
--- gnome/gtk/Makefile.am       3 Apr 2004 10:25:34 -0000       1.9
+++ gnome/gtk/Makefile.am       13 May 2004 13:32:35 -0000
@@ -144,7 +144,7 @@ CLEANFILES += guile-gnome-gw-glade.c gui
        guile-gnome-gw-glade.log guile-gnome-gw-glade.html gw-glade.scm
 
 gw-atk.scm guile-gnome-gw-atk.c guile-gnome-gw-atk.h: gw-atk-spec.scm 
../gobject/defs-support.scm
-       guile -c \
+       @GUILE@ -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-atk-spec.scm\") \
@@ -152,7 +152,7 @@ gw-atk.scm guile-gnome-gw-atk.c guile-gn
        mv guile-gnome-gw-atk.scm gw-atk.scm
 
 gw-pango.scm guile-gnome-gw-pango.c guile-gnome-gw-pango.h: gw-pango-spec.scm 
../gobject/defs-support.scm
-       guile -c \
+       @GUILE@ -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-pango-spec.scm\") \
@@ -160,7 +160,7 @@ gw-pango.scm guile-gnome-gw-pango.c guil
        mv guile-gnome-gw-pango.scm gw-pango.scm
 
 gw-gdk.scm guile-gnome-gw-gdk.c guile-gnome-gw-gdk.h: gw-gdk-spec.scm 
../gobject/defs-support.scm
-       guile -c \
+       @GUILE@ -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-gdk-spec.scm\") \
@@ -169,7 +169,7 @@ gw-gdk.scm guile-gnome-gw-gdk.c guile-gn
 
 gw-gtk.scm guile-gnome-gw-gtk.c guile-gnome-gw-gtk.h: gw-gtk-spec.scm \
        ../gobject/defs-support.scm ../defs/gtk.defs ../defs/gtk-overrides.defs
-       guile -c \
+       @GUILE@ -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-gtk-spec.scm\") \
@@ -178,7 +178,7 @@ gw-gtk.scm guile-gnome-gw-gtk.c guile-gn
 
 gw-glade.scm guile-gnome-gw-glade.c guile-gnome-gw-glade.h: gw-glade-spec.scm \
        ../gobject/defs-support.scm ../defs/libglade.defs 
../defs/libglade-overrides.defs
-       guile -c \
+       @GUILE@ -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-glade-spec.scm\") \
Index: test-suite/Makefile.am
===================================================================
RCS file: /cvsroot/guile-gtk/guile-gobject/test-suite/Makefile.am,v
retrieving revision 1.3
diff -p -u -r1.3 Makefile.am
--- test-suite/Makefile.am      3 Apr 2004 10:25:21 -0000       1.3
+++ test-suite/Makefile.am      13 May 2004 13:32:35 -0000
@@ -23,7 +23,7 @@ CLEANFILES = guile-gnome-gw-glib.log gw-
 TESTS = guile-gobject-test
 
 gw-test-gobject.c gw-test-gobject.h gw-test-gobject.scm: 
gw-test-gobject-spec.scm test-gobject.defs
-       guile $(GUILE_FLAGS) -c \
+       @GUILE@ $(GUILE_FLAGS) -c \
          "(set! %load-path (cons \"${G_WRAP_MODULE_DIR}\" %load-path)) \
           (set! %load-path (cons \"${top_srcdir}\" %load-path)) \
           (primitive-load \"$(srcdir)/gw-test-gobject-spec.scm\") \

-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org