--- Makefile.orig Mon May 12 20:19:36 1997 +++ Makefile Tue Sep 2 16:26:44 1997 @@ -1,5 +1,5 @@ # -# Makefile for XmySQL on Linux +# Makefile for XmySQL on FreeBSD # ######################################################## @@ -36,24 +36,24 @@ PROGRAM = xmysql # PROGRAM install path -INSTALLPATH = /xmysql-1.4 +INSTALLPATH = $(X11BASE)/bin # pixmap location -XPM_PATH = /xmysql-1.4 +XPM_PATH = $(X11BASE)/include/X11/pixmaps # help path -HELP_PATH = /xmysql-1.4 +HELP_PATH = $(X11BASE)/lib/X11/xmysql-1.5 # Compilation Details -CC = gcc -STDCFLAGS = -g -c -O2 -Wall -DXPMPATH=\"$(XPM_PATH)\" -DHELPPATH=\"$(HELP_PATH)\" +# CC = gcc +STDCFLAGS = $(CFLAGS) -c -DXPMPATH=\"$(XPM_PATH)\" -DHELPPATH=\"$(HELP_PATH)\" STDLFLAGS = MYSQLINC = -I/usr/local/include/mysql MYSQLLOAD = -L/usr/local/lib/mysql -lmysqlclient -lmysys -ldbug -lmystrings -XFORMLIBDIR = -L/usr/lib -XFORMINCDIR = -I/usr/include +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 \ @@ -62,10 +62,12 @@ 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) @@ -74,7 +76,7 @@ rm -f ${PROGRAM} $(OBJS) install: - install --mode=711 $(PROGRAM) $(INSTALLPATH) - install --mode=744 mysql.xpm $(XPM_PATH) - install --mode=744 sqlhelp.txt $(HELP_PATH) - + install -s -m 511 $(PROGRAM) $(INSTALLPATH) + install -m 444 mysql.xpm $(XPM_PATH) + install -d -m 755 $(HELP_PATH) + install -m 444 sqlhelp.txt $(HELP_PATH)