$NetBSD: patch-aa,v 1.5 2002/09/26 15:46:47 jschauma Exp $

--- Makefile.netBSD.orig	Wed Nov 15 14:59:20 2000
+++ Makefile.netBSD	Thu Sep 26 11:42:57 2002
@@ -1,24 +1,24 @@
 CURRENT_DIR = 	.
 
 
-SUBDIRS =	Xpm ABV X11 Kernel Plot Database Fig Interface X11/xedit SAMCEF 
+SUBDIRS =	ABV X11 Kernel Plot Database Fig Interface X11/xedit SAMCEF 
 
 SUBDIRS2 =	ABV X11 Kernel Plot Database Fig Interface
-MAKE =	make
+#MAKE?=	make
 
 #for linux and aix LIBS = -L /lib/X11 -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
 #for silicon: LIBS = -lXaw -lX11 -lm -lXt -lXmu -lXext
 #for hp LIBS = -L /lib/X11 -L /usr/X11R6/lib -L /usr/contrib/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
-LIBS = -L /usr/lib -L /usr/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
+LIBS = -lXaw -lXpm -lX11 -lm -lXt -lXmu -lXext
 #LIBS = -L /lib/X11 -L /usr/X11R6/lib -L /usr/contrib/X11R6/lib -lXaw -lX11 -lm -lXt -lXmu -lXext
 
 #for hp DEFINE = -D_HPUX_SOURCE
 DEFINE = 
 
-CFLAGS = 
+#CFLAGS = 
 
 #for hp IncludeDir = /usr/contrib/X11R6/include
-IncludeDir = /usr/X11R6/include
+IncludeDir = ${X11BASE}/include
 
 #for hp Ccompiler = c89
 Ccompiler = cc
@@ -30,13 +30,13 @@
 	if [ -d $$i ] ; \
 	then \
 	(cd $$i ; echo "making" all "in $(CURRENT_DIR)/$$i..."; \
-	$(MAKE) TOPCFLAGS=$(CFLAGS) IncludeDir=$(IncludeDir) Ccompiler=$(Ccompiler) DEFINE=$(DEFINE) all); \
+	$(MAKE) TOPCFLAGS="$(CFLAGS)" IncludeDir="$(IncludeDir)" Ccompiler="$(Ccompiler)" DEFINE="$(DEFINE)" all); \
 	fi \
 	done
 	cc -o abs  ./Plot/*.o ./ABV/*.o \
         Fig/*.o Interface/*.o X11/xedit/*.o \
-        ./Kernel/*.o ./X11/*.o ./Database/*.o ./Xpm/libxpm.a\
-        $(LIBS) $(DEFINE)
+        ./Kernel/*.o ./X11/*.o ./Database/*.o \
+        ${LDFLAGS} ${LIBS} ${DEFINE}