--- Makefile.orig	Fri Oct 23 03:35:51 1998
+++ Makefile	Fri Dec 25 14:53:40 1998
@@ -31,24 +31,23 @@
 PROGRAM = 	xmysql
 
 # PROGRAM install path
-INSTALLPATH = /usr/local/xmysql-1.9
+INSTALLPATH = ${PREFIX}/bin
 
 # pixmap location
-XMYSQL_XPMPATH = /usr/local/xmysql-1.9
+XMYSQL_XPMPATH = ${X11BASE}/include/X11/pixmaps
 
 # help path
-XMYSQL_HELPPATH = /usr/local/xmysql-1.9
+XMYSQL_HELPPATH = ${X11BASE}/lib/X11/xmysql
 
 # Compilation Details
-CC = gcc
-STDCFLAGS = -g -c -O2 -Wall -DXMYSQL_XPMPATH=\"$(XMYSQL_XPMPATH)\" -DXMYSQL_HELPPATH=\"$(XMYSQL_HELPPATH)\"
+STDCFLAGS = $(CFLAGS) -DXMYSQL_XPMPATH=\"$(XMYSQL_XPMPATH)\" -DXMYSQL_HELPPATH=\"$(XMYSQL_HELPPATH)\"
 STDLFLAGS = 
-MYSQLINC = -I/usr/include/mysql
-MYSQLLOAD = -L/usr/lib/mysql -lmysqlclient
-XFORMLIBDIR = -L/usr/local/xforms
-XFORMINCDIR = -I/usr/local/xforms
+MYSQLINC = -I${LOCALBASE}/include/mysql
+MYSQLLOAD = -L${LOCALBASE}/lib/mysql -lmysqlclient
+XFORMLIBDIR = -L${X11BASE}/lib
+XFORMINCDIR = -I${X11BASE}/include
 XINC = 
-XLOAD = -L/usr/X11R6/lib  -lX11
+XLOAD = -L${X11BASE}/lib  -lX11
 
 # objects needed for the program
 OBJS =  Xmysql.o \
@@ -57,20 +56,23 @@
 	XmysqlDB.o \
 	XmysqlErr.o
  
+all: ${PROGRAM}
+
 ${PROGRAM}: $(OBJS)
 	$(CC) -o ${PROGRAM} $(OBJS) $(MYSQLINC) $(XFORMINCDIR) \
 	$(XINC) $(STDLFLAGS) $(MYSQLLOAD) \
-	$(XLOAD) $(XFORMLIBDIR) -lforms -lXpm -lm
+	$(XLOAD) $(XFORMLIBDIR) -lxforms -lXpm -lm
 
 .c.o:
-	$(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(XINC)
+	$(CC) -c $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(XINC)
 
 clean:
 	rm -f ${PROGRAM} $(OBJS) 
 
 install:
 	install -d $(INSTALLPATH) $(XMYSQL_XPMPATH) $(XMYSQL_HELPPATH)
-	install --mode=711 $(PROGRAM) $(INSTALLPATH)
-	install --mode=744 mysql.xpm $(XMYSQL_XPMPATH)
-	install --mode=744 sqlhelp.txt $(XMYSQL_HELPPATH) 
+	install -s -m 511 $(PROGRAM) $(INSTALLPATH)
+	install -m 444 mysql.xpm $(XMYSQL_XPMPATH)
+	install -d -m 755 $(XMYSQL_HELPPATH)
+	install -m 444 sqlhelp.txt $(XMYSQL_HELPPATH)