$NetBSD: patch-aa,v 1.2 2004/12/01 04:47:53 dmcmahill Exp $

--- Makefile.in.orig	Fri Jul 16 01:59:50 2004
+++ Makefile.in
@@ -796,11 +796,11 @@ CORE_SRC = \
 BUILDOPTS = $(DEBUG) $(ARCHFLAGS) 
 BUILDDIR = obj
 HDS = src/include
-CFLAGS = $(OPTIMIZE) $(DEBUG) $(GRAPH_FLAGS) $(ARCHFLAGS) $(FORTECFLAGS) -I$(HDS) \
+CFLAGS = @CPPFLAGS@ $(OPTIMIZE) $(DEBUG) $(GRAPH_FLAGS) $(ARCHFLAGS) $(FORTECFLAGS) -I$(HDS) \
     $(LANGLISPCFLAGS) $(LANGTCLCFLAGS) $(LANGJAVACFLAGS) $(SIMIRSIM_CFLAGS) \
     $(CADENCECFLAGS) $(SUNCFLAGS) $(INTERNATIONALCFLAGS) $(UNICODECFLAGS) @PTHREAD_CFLAGS@
-XCFLAGS = $(CFLAGS) $(XPOWER) $(TRUETYPECFLAGS) $(QT_CFLAGS)
-LIBS = @X_PRE_LIBS@ @X_LIBS@ $(TRUETYPE_LIBS) $(FSDB_LIBS) $(GRAPH_LIBS) -lm @X_EXTRA_LIBS@ \
+XCFLAGS = @CPPFLAGS@ $(CFLAGS) $(XPOWER) $(TRUETYPECFLAGS) $(QT_CFLAGS)
+LIBS = @LDFLAGS@ @X_PRE_LIBS@ @X_LIBS@ $(TRUETYPE_LIBS) $(FSDB_LIBS) $(GRAPH_LIBS) -lm @X_EXTRA_LIBS@ \
     $(LANGTCLLIBS) $(LANGJAVALIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
 FIND = find
 INSTALL = install
@@ -943,8 +943,8 @@ install: all
 	for d in `$(FIND) . -type d -print`; do \
 	  $(INSTALL) -d -m755 $(DESTDIR)@datadir@/electric/lib/$$d ; \
 	  (cd $$d ; \
-	  for f in `$(FIND) . -type f -maxdepth 1 -print`; do \
-	    $(INSTALL) -m644 $$f $(DESTDIR)@datadir@/electric/lib/$$d/$$f ; \
+	  for f in * ; do \
+	    if test -f $$f ; then $(INSTALL) -m644 $$f $(DESTDIR)@datadir@/electric/lib/$$d/$$f ; fi ; \
 	  done ) ; \
 	done ) ; 
 
@@ -955,8 +955,8 @@ install.html:
 	for d in `$(FIND) . -type d -print`; do \
 	  $(INSTALL) -d -m755 $(DESTDIR)@datadir@/electric/doc/html/$$d ; \
 	  (cd $$d ; \
-	  for f in `$(FIND) . -type f -maxdepth 1 -print`; do \
-	    $(INSTALL) -m644 $$f $(DESTDIR)@datadir@/electric/doc/html/$$d/$$f ; \
+	  for f in * ; do \
+	    if test -f $$f ; then $(INSTALL) -m644 $$f $(DESTDIR)@datadir@/electric/doc/html/$$d/$$f ; fi ; \
 	  done ) ; \
 	done ) ;