$NetBSD: patch-aa,v 1.2 2002/04/17 04:45:13 fredb Exp $

--- Makefile.orig	Sun Aug 27 22:57:00 2000
+++ Makefile
@@ -8,36 +8,43 @@
 all: xsqlmenu
 
 #XFORMSBASE = /opt/lib
-XFORMSBASE = /usr/X11R6/lib
+XFORMSBASE = ${PREFIX}
 ifeq (${DB},msql)
 # Set MSQLBASE to the place where your MiniSQL distribution resides !
 #MSQLBASE = /opt/lib/Hughes
 MSQLBASE = /usr/local/Hughes
 else
-MYSQLPREFIX = /usr
+MYSQLPREFIX = ${LOCALBASE}
 endif
 
 ifeq (${DB},msql)
 CFLAGS  = -O -Wall -I$(MSQLBASE)/include
 LDFLAGS = -L $(MSQLBASE)/lib -lmsql -L$(XFORMSBASE) -lforms -lXpm \
+	  -L$(LOCALBASE)/lib -ljpeg \
           -L/usr/X11R6/lib -lX11 -lm
 LDSTATICFLAGS= -L $(MSQLBASE)/lib -lmsql $(XFORMSBASE)/libforms.a \
+	  $(LOCALBASE)/lib/libjpeg.a \
           $(XFORMSBASE)/libXpm.a -L/usr/X11R6/lib -lX11 -lm
 .msql:
 	touch .msql
 	rm -f .mysql
-	make clean
+	gmake clean
 TYPE=.msql
 else
-CFLAGS  = -O -Wall -I$(MYSQLPREFIX)/include/mysql -DUSE_MYSQL
-LDFLAGS = -L $(MYSQLPREFIX)/lib/mysql -lmysqlclient -L$(XFORMSBASE) -lforms \
-	-lXpm -L/usr/X11R6/lib -lX11 -lm
+CFLAGS  = -O -Wall -I$(MYSQLPREFIX)/include/mysql -DUSE_MYSQL \
+	  -I${X11BASE}/include/X11 \
+	  -I${X11BASE}/include \
+	  -I${LOCALBASE}/include
+LDFLAGS = -L$(MYSQLPREFIX)/lib/mysql -Wl,-R$(MYSQLPREFIX)/lib/mysql -lmysqlclient -L$(XFORMSBASE) -Wl,-R$(XFORMSBASE) -lforms \
+	  -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -ljpeg \
+	-lXpm -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lm
 LDSTATICFLAGS= -L $(MYSQLPREFIX)/lib/mysql -lmysqlclient $(XFORMSBASE)/libforms.a \
+	  $(LOCALBASE)/lib/libjpeg.a \
           $(XFORMSBASE)/libXpm.a -L/usr/X11R6/lib -lX11 -lm
 .mysql:
 	touch .mysql
 	rm -f .msql
-	make clean
+	gmake clean
 TYPE=.mysql
 endif