-break out patches to ./src/motif/Makefile.in to its own patch.

-add entries to several Makefile.in's to include the correct include path
 for guile includes (as determined by configure)

6 files changed, 61 insertions, 19 deletions

diff --git a/misc/gnucash/files/patch-sum b/misc/gnucash/files/patch-sum
index ed877a729f2..18b55fbbd28 100644
--- a/misc/gnucash/files/patch-sum
+++ b/misc/gnucash/files/patch-sum
@@ -1,6 +1,10 @@
-$NetBSD: patch-sum,v 1.1 1999/07/09 14:09:16 agc Exp $
+$NetBSD: patch-sum,v 1.2 2000/02/28 02:34:43 dmcmahill Exp $
 
-MD5 (patch-aa) = 22e66fdd05b6761c2daa9d70f62a1422
+MD5 (patch-aa) = 156104e3f90f84be26e0a0479d72d4bd
 MD5 (patch-ab) = 6305321e97c828a6677811d83ca922e4
 MD5 (patch-ac) = ac5cd850f1f2e74361c5f20f4db094a2
 MD5 (patch-ad) = a963aa55e15d9b10447bed4ebf38a20c
+MD5 (patch-ae) = a1854ae8b1b196e5697bd5ae811bf57a
+MD5 (patch-af) = f0c9ed18ecb0aa779e9a6b9c586f1aeb
+MD5 (patch-ag) = bd566569c82a5329c037a194b99ca570
+MD5 (patch-ah) = 2f3dc2f98f1552f068ce56c407ba5907
diff --git a/misc/gnucash/patches/patch-aa b/misc/gnucash/patches/patch-aa
index 192ea07c341..0f925c77e49 100644
--- a/misc/gnucash/patches/patch-aa
+++ b/misc/gnucash/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/01/23 03:56:11 mellon Exp $
+$NetBSD: patch-aa,v 1.2 2000/02/28 02:34:44 dmcmahill Exp $
 
 diff -rc2 --exclude=Makefile Makefile.in Makefile.in
 *** Makefile.in	Tue Jan  5 23:58:02 1999
@@ -190,22 +190,6 @@ diff -rc2 --exclude=Makefile src/motif/FileBox.c src/motif/FileBox.c
 !       *previous_path = 0x0;
     }
   
-diff -rc2 --exclude=Makefile src/motif/Makefile.in src/motif/Makefile.in
-*** src/motif/Makefile.in	Sun Jan  3 01:51:20 1999
---- src/motif/Makefile.in	Fri Jan 22 12:28:38 1999
-***************
-*** 41,45 ****
-  LIBS     = -L$(prefix)/lib \
-             @X_PRE_LIBS@ @MOTIF_LIBS@ @X_EXTRA_LIBS@ @X_LIBS@ \
-!            $(GUILELIBS) @LIBS@  -lnana
-  
-  # Have to use wildcard here otherwise filters below won't get the expanded
---- 41,45 ----
-  LIBS     = -L$(prefix)/lib \
-             @X_PRE_LIBS@ @MOTIF_LIBS@ @X_EXTRA_LIBS@ @X_LIBS@ \
-!            $(GUILELIBS) @LIBS@
-  
-  # Have to use wildcard here otherwise filters below won't get the expanded
 diff -rc2 --exclude=Makefile src/swig/Makefile.in src/swig/Makefile.in
 *** src/swig/Makefile.in	Sun Jan  3 03:22:06 1999
 --- src/swig/Makefile.in	Fri Jan 22 22:02:13 1999
diff --git a/misc/gnucash/patches/patch-ae b/misc/gnucash/patches/patch-ae
new file mode 100644
index 00000000000..f7760528040
--- /dev/null
+++ b/misc/gnucash/patches/patch-ae
@@ -0,0 +1,19 @@
+$NetBSD: patch-ae,v 1.1 2000/02/28 02:34:44 dmcmahill Exp $
+
+--- ./src/motif/Makefile.in.orig	Sun Jan  3 01:51:20 1999
++++ ./src/motif/Makefile.in	Sun Feb 27 21:19:56 2000
+@@ -33,5 +33,6 @@
+            -I@srcdir@/../../@XMHTML_INC@ \
+            -I@srcdir@/../../lib/Xbae-4.6.2-linas \
+-           -I$(prefix)/include
++           -I$(prefix)/include \
++	    @GUILE_INC@
+ 
+ CFLAGS   = @CFLAGS@ @X_CFLAGS@ -DCELL_WIDGETS=1 ${INCLPATH}
+@@ -41,5 +42,5 @@
+ LIBS     = -L$(prefix)/lib \
+            @X_PRE_LIBS@ @MOTIF_LIBS@ @X_EXTRA_LIBS@ @X_LIBS@ \
+-           $(GUILELIBS) @LIBS@  -lnana
++           $(GUILELIBS) @LIBS@
+ 
+ # Have to use wildcard here otherwise filters below won't get the expanded
diff --git a/misc/gnucash/patches/patch-af b/misc/gnucash/patches/patch-af
new file mode 100644
index 00000000000..e8fcde98cd8
--- /dev/null
+++ b/misc/gnucash/patches/patch-af
@@ -0,0 +1,11 @@
+$NetBSD: patch-af,v 1.1 2000/02/28 02:34:44 dmcmahill Exp $
+
+--- ./src/reports/Makefile.in.orig	Wed Oct 28 00:55:33 1998
++++ ./src/reports/Makefile.in	Sun Feb 27 21:22:05 2000
+@@ -24,5 +24,5 @@
+ include @top_srcdir@/Makefile.init
+ 
+-INCLPATH = -I../.. -I../engine -I@srcdir@/../../include -I@prefix@/include
++INCLPATH = -I../.. -I../engine -I@srcdir@/../../include -I@prefix@/include @GUILE_INC@
+ CFLAGS   = @CFLAGS@ @X_CFLAGS@ ${INCLPATH}
+ 
diff --git a/misc/gnucash/patches/patch-ag b/misc/gnucash/patches/patch-ag
new file mode 100644
index 00000000000..44bb8e30049
--- /dev/null
+++ b/misc/gnucash/patches/patch-ag
@@ -0,0 +1,12 @@
+$NetBSD: patch-ag,v 1.1 2000/02/28 02:34:44 dmcmahill Exp $
+
+--- ./src/swig/guile/Makefile.in.orig	Mon Nov 23 00:08:33 1998
++++ ./src/swig/guile/Makefile.in	Sun Feb 27 21:23:21 2000
+@@ -31,5 +31,6 @@
+            -I@top_srcdir@/lib/ComboBox-1.33 \
+            -I@top_srcdir@/lib/Xbae-4.6.2-linas \
+-           -I$(prefix)/include
++           -I$(prefix)/include \
++            @GUILE_INC@
+ 
+ CFLAGS   = @CFLAGS@ @X_CFLAGS@ -DCELL_WIDGETS=1 ${INCLPATH} -Wno-unused
diff --git a/misc/gnucash/patches/patch-ah b/misc/gnucash/patches/patch-ah
new file mode 100644
index 00000000000..b9610adb190
--- /dev/null
+++ b/misc/gnucash/patches/patch-ah
@@ -0,0 +1,12 @@
+$NetBSD: patch-ah,v 1.1 2000/02/28 02:34:44 dmcmahill Exp $
+
+--- ./src/guile/Makefile.in.orig	Sat Dec 19 03:16:25 1998
++++ ./src/guile/Makefile.in	Sun Feb 27 21:24:16 2000
+@@ -36,5 +36,6 @@
+            -I@top_srcdir@/lib/ComboBox-1.33 \
+            -I@top_srcdir@/lib/Xbae-4.6.2-linas \
+-           -I$(prefix)/include
++           -I$(prefix)/include \
++            @GUILE_INC@
+ 
+ CFLAGS   = @CFLAGS@ @X_CFLAGS@ -DCELL_WIDGETS=1 ${INCLPATH}