2006-01-20 11:41:49 -05:00
|
|
|
--- lib/Makefile.in.orig Thu Dec 8 00:25:48 2005
|
|
|
|
|
+++ lib/Makefile.in Sun Jan 15 14:54:18 2006
|
2005-02-09 09:18:21 -05:00
|
|
|
@@ -22,6 +22,11 @@
|
2003-07-27 16:47:04 -04:00
|
|
|
|
2002-09-19 16:43:12 -04:00
|
|
|
have_gtk = @have_gtk@
|
2002-05-20 22:37:33 -04:00
|
|
|
|
2002-11-20 08:34:09 -05:00
|
|
|
+datadir = @datadir@
|
|
|
|
|
+CPPFLAGS = @CPPFLAGS@ -DDATADIR=\"$(datadir)\"
|
|
|
|
|
+LDFLAGS = @LDFLAGS@
|
|
|
|
|
+INTL_LIBS = @LTLIBINTL@
|
|
|
|
|
+
|
|
|
|
|
ifeq ($(INSTALL_PROGRAM),)
|
|
|
|
|
INSTALL_PROGRAM = $(INSTALL) -m 755
|
2002-05-20 22:37:33 -04:00
|
|
|
endif
|
2005-02-09 09:18:21 -05:00
|
|
|
@@ -36,7 +41,7 @@
|
2002-09-19 16:43:12 -04:00
|
|
|
libdir = $(prefix)/lib
|
|
|
|
|
includedir = $(prefix)/include/gretl
|
|
|
|
|
aclocaldir = $(prefix)/share/aclocal
|
|
|
|
|
-pkgconfigdir = $(libdir)/pkgconfig
|
|
|
|
|
+pkgconfigdir = $(prefix)/libdata/pkgconfig
|
|
|
|
|
|
|
|
|
|
INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir)
|
|
|
|
|
|
2005-02-09 09:18:21 -05:00
|
|
|
@@ -52,8 +57,8 @@
|
2003-07-07 03:18:00 -04:00
|
|
|
|
2003-07-27 16:47:04 -04:00
|
|
|
# hard-coded -L/usr/local/lib is a bodge!!
|
2002-11-20 08:34:09 -05:00
|
|
|
|
2003-12-25 13:02:18 -05:00
|
|
|
-LIBS = $(LAPACK_LIBS) -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) \
|
|
|
|
|
- $(GLIB_LIBS) $(GMP_LIBS)
|
|
|
|
|
+LIBS = $(LAPACK_LIBS) -lm -lz $(XML_LIBS) \
|
|
|
|
|
+ $(GLIB_LIBS) $(GMP_LIBS) $(INTL_LIBS)
|
2002-05-20 22:37:33 -04:00
|
|
|
|
|
|
|
|
#### End of system configuration section. ####
|
|
|
|
|
|
2006-01-20 11:41:49 -05:00
|
|
|
@@ -186,7 +191,7 @@
|
2003-04-25 20:30:43 -04:00
|
|
|
LIBTOOL = ../libtool
|
2002-05-20 22:37:33 -04:00
|
|
|
|
2003-12-25 13:02:18 -05:00
|
|
|
override CFLAGS += -I.. -I$(topsrc) -I$(libsrc) $(XML_CFLAGS) $(GLIB_CFLAGS) \
|
|
|
|
|
- $(GMP_CFLAGS) -DHAVE_CONFIG_H
|
|
|
|
|
+ $(GMP_CFLAGS) -DHAVE_CONFIG_H $(CPPFLAGS)
|
2002-05-20 22:37:33 -04:00
|
|
|
|
2003-12-25 13:02:18 -05:00
|
|
|
COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
|
2002-09-19 16:43:12 -04:00
|
|
|
|
2006-01-20 11:41:49 -05:00
|
|
|
@@ -195,7 +200,7 @@
|
|
|
|
|
$(CC) $(CFLAGS) -MM -MT $*.lo $< > .deps/$*.d
|
|
|
|
|
|
2003-12-25 13:02:18 -05:00
|
|
|
$(LIBGRETL): .deps $(LOBJS) $(AUX_LOBJ)
|
2006-01-20 11:41:49 -05:00
|
|
|
- $(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(AUX_LOBJ) \
|
|
|
|
|
+ $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(LOBJS) $(AUX_LOBJ) \
|
2005-02-09 09:18:21 -05:00
|
|
|
-rpath $(prefix)/lib $(LIBS) \
|
2006-01-20 11:41:49 -05:00
|
|
|
-version-info $(CURRENT):$(REVISION):$(AGE)
|
2002-05-20 22:37:33 -04:00
|
|
|
|
