Slightly better version of "don't include wrong global.h" bandaid.

svn path=/head/; revision=51529

x11-fm/gnomemc/files/patch-ac

@@ -2,7 +2,7 @@
 $FreeBSD$
 
 --- Make.common.in.orig	Fri Jul 20 18:22:50 2001
-+++ Make.common.in	Tue Sep 11 18:23:08 2001
++++ Make.common.in	Fri Dec 14 11:04:04 2001
 @@ -13,10 +13,10 @@
  datadir    = @datadir@
  libdir	   = @libdir@
@@ -16,3 +16,12 @@ $FreeBSD$
  man1dir    = $(mandir)/man1
  manext     = 1
  man8dir    = $(mandir)/man8
+@@ -38,7 +38,7 @@
+ # No way, to make make happy (except GNU), we cannot use := to append
+ # something to these, so that's why there is a leading _
+ XCFLAGS = @CFLAGS@
+-XCPPFLAGS = -I.. @CPPFLAGS@ @MCCPPFLAGS@ @GLIB_CFLAGS@
++XCPPFLAGS = -I$(mcsrcdir) -I.. @CPPFLAGS@ @MCCPPFLAGS@ @GLIB_CFLAGS@
+ XLDFLAGS = @LDFLAGS@
+ XDEFS = @DEFS@
+ XLIBS = @LIBS@

x11-fm/gnomemc/files/patch-src::Makefile.in

@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- src/Makefile.in	2001/12/14 08:48:56	1.1
-+++ src/Makefile.in	2001/12/14 08:49:23
-@@ -8,7 +8,7 @@
- @MCF@
- 
- CFLAGS   = $(XCFLAGS)
--CPPFLAGS = $(XCPPFLAGS) @MCCFLAGS@
-+CPPFLAGS = -I. $(XCPPFLAGS) @MCCFLAGS@
- LDFLAGS  = $(XLDFLAGS)
- DEFS     = $(XDEFS) -DREGEX_MALLOC -DLIBDIR=\""$(mclibdir)/"\" \
- 	-DCONFDIR=\""$(confdir)/"\" -DLOCALEDIR=\""$(localedir)/"\"