43958cfc23
from brad@
49 lines
2.7 KiB
Plaintext
49 lines
2.7 KiB
Plaintext
$OpenBSD: patch-source_linux_Makefile_in,v 1.3 2007/01/30 07:59:42 wilfried Exp $
|
|
--- source/linux/Makefile.in.orig Thu Jan 18 17:59:55 2007
|
|
+++ source/linux/Makefile.in Thu Jan 25 21:13:07 2007
|
|
@@ -68,10 +68,10 @@ mysql_administrator_bin_OBJECTS = \
|
|
$(am_mysql_administrator_bin_OBJECTS)
|
|
mysql_administrator_bin_DEPENDENCIES = \
|
|
$(top_srcdir)/library/source/libadmin.a \
|
|
- $(top_srcdir)/../mysql-gui-common/source/linux/libmacommongui.a \
|
|
- $(top_srcdir)/../mysql-gui-common/library/base-library/source/.libs/libmysqlx.a \
|
|
- $(top_srcdir)/../mysql-gui-common/library/sql-parser/source/.libs/libsqlparser.a \
|
|
- $(top_srcdir)/../mysql-gui-common/library/utilities/source/.libs/libguiutil.a
|
|
+ $(LOCALBASE)/share/mysql-gui/common/source/linux/libmacommongui.a \
|
|
+ $(LOCALBASE)/share/mysql-gui/common/library/base-library/source/.libs/libmysqlx.a \
|
|
+ $(LOCALBASE)/share/mysql-gui/common/library/sql-parser/source/.libs/libsqlparser.a \
|
|
+ $(LOCALBASE)/share/mysql-gui/common/library/utilities/source/.libs/libguiutil.a
|
|
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
|
|
SCRIPTS = $(bin_SCRIPTS)
|
|
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
|
|
@@ -230,10 +230,10 @@ mysql_administrator_bin_SOURCES = \
|
|
MADummyPanel.cc
|
|
|
|
INCLUDES = @GNOME_CFLAGS@ @MYSQL_CFLAGS@ @PCRE_CFLAGS@\
|
|
- -I$(top_srcdir)/../mysql-gui-common/source/linux\
|
|
- -I$(top_srcdir)/../mysql-gui-common/library/base-library/include\
|
|
- -I$(top_srcdir)/../mysql-gui-common/library/utilities/shared_include\
|
|
- -I$(top_srcdir)/../mysql-gui-common/library/utilities/include\
|
|
+ -I$(LOCALBASE)/share/mysql-gui/common/source/linux\
|
|
+ -I$(LOCALBASE)/share/mysql-gui/common/library/base-library/include\
|
|
+ -I$(LOCALBASE)/share/mysql-gui/common/library/utilities/shared_include\
|
|
+ -I$(LOCALBASE)/share/mysql-gui/common/library/utilities/include\
|
|
-I$(top_srcdir)/library/include\
|
|
-DPREFIX=\""$(PREFIX)"\"\
|
|
-DDATADIRNAME=\""$(DATADIRNAME)"\"\
|
|
@@ -244,10 +244,10 @@ INCLUDES = @GNOME_CFLAGS@ @MYSQL_CFLAGS@
|
|
# mysql_administrator_bin_LDFLAGS=-pthread
|
|
mysql_administrator_bin_LDADD = \
|
|
$(top_srcdir)/library/source/libadmin.a\
|
|
- $(top_srcdir)/../mysql-gui-common/source/linux/libmacommongui.a\
|
|
- $(top_srcdir)/../mysql-gui-common/library/base-library/source/.libs/libmysqlx.a\
|
|
- $(top_srcdir)/../mysql-gui-common/library/sql-parser/source/.libs/libsqlparser.a\
|
|
- $(top_srcdir)/../mysql-gui-common/library/utilities/source/.libs/libguiutil.a\
|
|
+ $(LOCALBASE)/share/mysql-gui/common/source/linux/libmacommongui.a\
|
|
+ $(LOCALBASE)/share/mysql-gui/common/library/base-library/source/.libs/libmysqlx.a\
|
|
+ $(LOCALBASE)/share/mysql-gui/common/library/sql-parser/source/.libs/libsqlparser.a\
|
|
+ $(LOCALBASE)/share/mysql-gui/common/library/utilities/source/.libs/libguiutil.a\
|
|
@MYSQL_LIBS@ @GNOME_LIBS@ @UTIL_LIBS@ @PCRE_LIBS@
|
|
|
|
all: config.h
|