9807afcb60
and package revision, since we may now link against the forms shared library, and because we also have to add a dependency on jpeg lib.
62 lines
1.9 KiB
Text
62 lines
1.9 KiB
Text
$NetBSD: patch-aa,v 1.3 2002/04/17 04:45:10 fredb Exp $
|
|
|
|
--- Makefile.orig Tue Nov 17 22:19:06 1998
|
|
+++ Makefile
|
|
@@ -31,24 +31,24 @@
|
|
PROGRAM = xmysql
|
|
|
|
# PROGRAM install path
|
|
-INSTALLPATH = /usr/local/xmysql-1.10
|
|
+INSTALLPATH = ${PREFIX}/bin
|
|
|
|
# pixmap location
|
|
-XMYSQL_XPMPATH = /usr/local/xmysql-1.10
|
|
+XMYSQL_XPMPATH = ${PREFIX}/share/xmysql
|
|
|
|
# help path
|
|
-XMYSQL_HELPPATH = /usr/local/xmysql-1.10
|
|
+XMYSQL_HELPPATH = ${PREFIX}/share/xmysql
|
|
|
|
# Compilation Details
|
|
-CC = gcc
|
|
+CC = cc
|
|
STDCFLAGS = -g -c -O2 -Wall -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
|
|
-XINC =
|
|
-XLOAD = -L/usr/X11R6/lib -lX11
|
|
+STDLFLAGS = ${LDFLAGS}
|
|
+MYSQLINC = -I${PREFIX}/include/mysql
|
|
+MYSQLLOAD = -Wl,-R${PREFIX}/lib/mysql -L${PREFIX}/lib/mysql -lmysqlclient
|
|
+XFORMLIBDIR = -L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib
|
|
+XFORMINCDIR = -I${X11PREFIX}/include/X11
|
|
+XINC = -I${X11BASE}/include
|
|
+XLOAD = -lX11
|
|
|
|
# objects needed for the program
|
|
OBJS = Xmysql.o \
|
|
@@ -60,7 +60,7 @@
|
|
${PROGRAM}: $(OBJS)
|
|
$(CC) -o ${PROGRAM} $(OBJS) $(MYSQLINC) $(XFORMINCDIR) \
|
|
$(XINC) $(STDLFLAGS) $(MYSQLLOAD) \
|
|
- $(XLOAD) $(XFORMLIBDIR) -lforms -lXpm -lm
|
|
+ $(XLOAD) $(XFORMLIBDIR) -lforms -ljpeg -lXpm -lm
|
|
|
|
.c.o:
|
|
$(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(XINC)
|
|
@@ -69,8 +69,8 @@
|
|
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)
|
|
+ ${BSD_INSTALL_DATA_DIR} -d $(XMYSQL_XPMPATH) $(XMYSQL_HELPPATH)
|
|
+ ${BSD_INSTALL_PROGRAM} $(PROGRAM) $(INSTALLPATH)
|
|
+ ${BSD_INSTALL_DATA} mysql.xpm $(XMYSQL_XPMPATH)
|
|
+ ${BSD_INSTALL_DATA} sqlhelp.txt $(XMYSQL_HELPPATH)
|
|
|