1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-15 23:50:44 +00:00
freebsd-ports/databases/xmysqladmin/files/patch-aa
Dirk Froemberg 4fabf0cd70 Upgrade to 1.0.
OK'ed by:	Andreas Klemm <andreas@FreeBSD.org> (maintainer)
1999-07-04 10:55:08 +00:00

95 lines
3.1 KiB
Plaintext

--- Makefile.orig Mon Dec 7 12:52:39 1998
+++ Makefile Thu Jul 1 16:43:57 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
########################################################
@@ -80,8 +80,7 @@
# Compilation Details
# hum... I think you dont need to change this
#-------------------------------------------------------
-CC = gcc
-STDCFLAGS = -g -c -O2 -Wall -DPIXMAPFILE=\"$(PIXMAPPATH)/mysql.xpm\" \
+STDCFLAGS = $(CFLAGS) -c -DPIXMAPFILE=\"$(PIXMAPPATH)/mysql.xpm\" \
-DBACKUP=\"$(BACKUP)\" -DBACKUPDIR=\"$(BACKUPDIR)\" \
-DBACKUPSUFFIX=\"$(BACKUPSUFFIX)\" \
-DMYSQL_VERSION=$(MYSQL_VERSION)
@@ -95,7 +94,7 @@
########################################################
# mysql include dir
#-------------------------------------------------------
-MYSQLINC = -I/usr/local/mysql/include/mysql
+MYSQLINC = -I${LOCALBASE}/include/mysql
########################################################
@@ -107,7 +106,7 @@
# mysql database dir
#-------------------------------------------------------
#MYSQLDBDIR = -DMYSQLDBDIR="\"/var/lib/mysql/\""
-MYSQLDBDIR = -DMYSQLDBDIR="\"/usr/local/mysql/var/\""
+MYSQLDBDIR = -DMYSQLDBDIR="\"/var/db/mysql/\""
########################################################
@@ -118,7 +117,7 @@
########################################################
# mysql library dir
#-------------------------------------------------------
-MYSQLLOAD = -Wl,-R/usr/local/mysql/lib/mysql -L/usr/local/mysql/lib/mysql -lmysqlclient
+MYSQLLOAD = -Wl,-R${LOCALBASE}/lib/mysql -L${LOCALBASE}/lib/mysql -lmysqlclient
########################################################
@@ -129,7 +128,7 @@
# xforms librairies dir
#-------------------------------------------------------
#XFORMLIBDIR = -L/opt/local/i386/lib
-XFORMLIBDIR = -L/usr/lib
+XFORMLIBDIR = -L${X11BASE}/lib
########################################################
@@ -141,7 +140,7 @@
# xforms include dir (xforms.h)
#-------------------------------------------------------
#XFORMINCDIR = -I/opt/local/include
-XFORMINCDIR = -I/usr/X11R6/include
+XFORMINCDIR = -I${X11BASE}/include
########################################################
@@ -157,7 +156,7 @@
# Use this for Linux:
XINC =
-XLOAD = -L/usr/X11R6/lib -lX11 /usr/X11R6/lib/libXpm.so.4
+XLOAD = -L${X11BASE}/lib -lX11
########################################################
@@ -215,8 +214,7 @@
${PROGRAM}: $(OBJS)
$(CC) -o ${PROGRAM} $(OBJS) $(MYSQLINC) $(XFORMINCDIR) \
$(XINC) $(STDLFLAGS) $(MYSQLLOAD) \
- $(XLOAD) $(XFORMLIBDIR) -lforms $(LIBS)
- ./$(PROGRAM)
+ $(XLOAD) $(XFORMLIBDIR) -lxforms -lXpm $(LIBS)
.c.o:
$(CC) $*.c $(STDCFLAGS) $(XFORMINCDIR) $(MYSQLINC) $(MYSQLDBDIR) $(XINC)