diff options
Diffstat (limited to 'databases/xbsql/files/patch-xbsql::Makefile.in')
| -rw-r--r-- | databases/xbsql/files/patch-xbsql::Makefile.in | 54 |
1 files changed, 22 insertions, 32 deletions
diff --git a/databases/xbsql/files/patch-xbsql::Makefile.in b/databases/xbsql/files/patch-xbsql::Makefile.in index e508898babb3..fe6b29b58fe9 100644 --- a/databases/xbsql/files/patch-xbsql::Makefile.in +++ b/databases/xbsql/files/patch-xbsql::Makefile.in @@ -1,37 +1,27 @@ ---- xbsql/Makefile.in.orig Fri Mar 28 21:03:25 2003 -+++ xbsql/Makefile.in Sun Nov 23 01:16:18 2003 -@@ -89,9 +89,9 @@ - am__include = @am__include@ - am__quote = @am__quote@ - install_sh = @install_sh@ --DEBUG = -g --CFLAGS = -UNO_READLINE -I/usr/local/include $(DEBUG) --CXXFLAGS = -UNO_READLINE -I/usr/local/include $(DEBUG) -+DEBUG = -+CFLAGS = @CFLAGS@ -UNO_READLINE -I/usr/local/include $(DEBUG) -+CXXFLAGS = @CXXFLAGS@ -UNO_READLINE -I/usr/local/include $(DEBUG) - LDFLAGS = $(DEBUG) +--- xbsql/Makefile.in.orig Fri Mar 28 12:03:25 2003 ++++ xbsql/Makefile.in Sun Jan 22 13:55:02 2006 +@@ -74,3 +74,3 @@ + AWK = @AWK@ +-CC = g++ ++CC = @CXX@ + CURSES = @CURSES@ +@@ -94,3 +94,3 @@ + CXXFLAGS = -UNO_READLINE -I/usr/local/include $(DEBUG) +-LDFLAGS = $(DEBUG) ++LDFLAGS = -L/usr/local/lib $(DEBUG) INCLUDE = -I/usr/local/include - -@@ -108,10 +108,10 @@ - xbsql.tab.c xb_datetime.cpp - - --libxbsql_la_LDFLAGS = -lxbase $(DEBUG) -+libxbsql_la_LDFLAGS = `xbase-config --libs` $(DEBUG) - - xql_SOURCES = xql.cpp --xql_LDADD = -lxbase -lreadline -l$(CURSES) ./libxbsql.la -+xql_LDADD = `xbase-config --libs` -lreadline -l$(CURSES) ./libxbsql.la - - - #install-data-hook: -@@ -228,7 +228,7 @@ - if test -f $$p \ - || test -f $$p1 \ +@@ -166,3 +166,3 @@ + CCLD = $(CC) +-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ ++LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -174,3 +174,3 @@ + CXXLD = $(CXX) +-CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ ++CXXLINK = $(LIBTOOL) --mode=link $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +@@ -230,3 +230,3 @@ ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ + f=`echo "$$p1" | sed 's,^.*/,,;s/$$/$(EXEEXT)/'`; \ echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \ - else :; fi; \ |