mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-14 23:46:10 +00:00
0dea090527
The API for libmysqlclient was changed a bit for mysql322. (xmysqladmin was written for mysql321.) So a db argument for mysql_real_connect() is necessary now and mysql_init() has to be called in order to initialize the connection struct. Problem reported by: jhk
107 lines
3.4 KiB
Plaintext
107 lines
3.4 KiB
Plaintext
--- Makefile.orig Sat Jan 10 18:17:46 1998
|
|
+++ Makefile Wed Feb 3 14:14:54 1999
|
|
@@ -34,7 +34,7 @@
|
|
# This is used by 'make install' command
|
|
#-------------------------------------------------------
|
|
#INSTALLPATH = /opt/local/i386/bin
|
|
-INSTALLPATH = /usr/local/bin
|
|
+INSTALLPATH = ${X11BASE}/bin
|
|
########################################################
|
|
|
|
|
|
@@ -45,7 +45,7 @@
|
|
# pixmap file location (mysql.xpm)
|
|
#-------------------------------------------------------
|
|
#PIXMAPPATH = /opt/local/lib
|
|
-PIXMAPPATH = /usr/local/bin
|
|
+PIXMAPPATH = ${X11BASE}/include/X11/pixmaps
|
|
########################################################
|
|
|
|
|
|
@@ -55,8 +55,8 @@
|
|
# mysql version
|
|
# mysql_reload() on 3.20, mysql_refresh() on 3.21
|
|
#-------------------------------------------------------
|
|
-#MYSQL_VERSION = 320 # for versions 3.20.#
|
|
-MYSQL_VERSION = 321 # for versions 3.21.#
|
|
+MYSQL_VERSION = 320 # for versions 3.20.#
|
|
+#MYSQL_VERSION = 321 # for versions 3.21.#
|
|
|
|
|
|
|
|
@@ -93,8 +93,8 @@
|
|
# Compilation Details
|
|
# hum... I think you dont need to change this
|
|
#-------------------------------------------------------
|
|
-CC = gcc
|
|
-STDCFLAGS = -g -c -O2 -Wall -DPIXMAPFILE=\"$(PIXMAPPATH)/mysql.xpm\" \
|
|
+# CC = gcc
|
|
+STDCFLAGS = $(CFLAGS) -c -DPIXMAPFILE=\"$(PIXMAPPATH)/mysql.xpm\" \
|
|
-DBACKUP=\"$(BACKUP)\" -DBACKUPDIR=\"$(BACKUPDIR)\" \
|
|
-DBACKUPSUFFIX=\"$(BACKUPSUFFIX)\" \
|
|
-DMYSQL_VERSION=$(MYSQL_VERSION)
|
|
@@ -109,7 +109,7 @@
|
|
# mysql include dir
|
|
#-------------------------------------------------------
|
|
#MYSQLINC = -I/opt/local/include/mysql
|
|
-MYSQLINC = -I/usr/local/include/mysql
|
|
+MYSQLINC = -I${LOCALBASE}/include/mysql
|
|
########################################################
|
|
|
|
|
|
@@ -121,7 +121,7 @@
|
|
# mysql database dir
|
|
#-------------------------------------------------------
|
|
#MYSQLDBDIR = -DMYSQLDBDIR="\"/var/lib/mysql/\""
|
|
-MYSQLDBDIR = -DMYSQLDBDIR="\"/usr/local/var/\""
|
|
+MYSQLDBDIR = -DMYSQLDBDIR="\"/var/db/mysql/\""
|
|
########################################################
|
|
|
|
|
|
@@ -133,7 +133,7 @@
|
|
# mysql library dir
|
|
#-------------------------------------------------------
|
|
#MYSQLLOAD = -L/opt/local/i386/lib/mysql -lmysqlclient -lmysys -ldbug -lmystrings
|
|
-MYSQLLOAD = -L/usr/local/lib/mysql -lmysqlclient -lmysys -ldbug -lmystrings
|
|
+MYSQLLOAD = -L${LOCALBASE}/lib/mysql -lmysqlclient -lmysys -ldbug -lmystrings
|
|
########################################################
|
|
|
|
|
|
@@ -144,7 +144,7 @@
|
|
# xforms librairies dir
|
|
#-------------------------------------------------------
|
|
#XFORMLIBDIR = -L/opt/local/i386/lib
|
|
-XFORMLIBDIR = -L/usr/lib
|
|
+XFORMLIBDIR = -L${X11BASE}/lib
|
|
########################################################
|
|
|
|
|
|
@@ -156,7 +156,7 @@
|
|
# xforms include dir (xforms.h)
|
|
#-------------------------------------------------------
|
|
#XFORMINCDIR = -I/opt/local/include
|
|
-XFORMINCDIR = -I/usr/include
|
|
+XFORMINCDIR = -I${X11BASE}/include
|
|
########################################################
|
|
|
|
|
|
@@ -172,7 +172,7 @@
|
|
|
|
# Use this for Linux:
|
|
XINC =
|
|
-XLOAD = -L/usr/X11R6/lib -lX11
|
|
+XLOAD = -L${X11BASE}/lib -lX11
|
|
########################################################
|
|
|
|
|
|
@@ -230,8 +230,7 @@
|
|
${PROGRAM}: $(OBJS)
|
|
$(CC) -o ${PROGRAM} $(OBJS) $(MYSQLINC) $(XFORMINCDIR) \
|
|
$(XINC) $(STDLFLAGS) $(MYSQLLOAD) \
|
|
- $(XLOAD) $(XFORMLIBDIR) -lforms -lXpm $(LIBS)
|
|
- ./$(PROGRAM)
|
|
+ $(XLOAD) $(XFORMLIBDIR) -lxforms -lXpm $(LIBS)
|
|
|
|
.c.o:
|
|
$(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(MYSQLDBDIR) $(XINC)
|