--- lib/Makefile.in.orig	Wed Dec  4 11:49:39 2002
+++ lib/Makefile.in	Sat Dec 14 05:26:28 2002
@@ -14,6 +14,11 @@
 GLIB_LIBS = @GLIB_LIBS@
 have_gtk = @have_gtk@
 
+datadir = @datadir@
+CPPFLAGS = @CPPFLAGS@ -DDATADIR=\"$(datadir)\"
+LDFLAGS = @LDFLAGS@
+INTL_LIBS = @LTLIBINTL@
+
 ifeq ($(INSTALL_PROGRAM),)
   INSTALL_PROGRAM = $(INSTALL) -m 755
 endif
@@ -28,7 +33,7 @@
 libdir = $(prefix)/lib
 includedir = $(prefix)/include/gretl
 aclocaldir = $(prefix)/share/aclocal
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(prefix)/libdata/pkgconfig
 
 INSTALLDIRS = $(libdir) $(includedir) $(aclocaldir)
 
@@ -42,7 +47,7 @@
   INSTALL_CFG = install-cfg-old
 endif
 
-LIBS = -lm -ldl -L/usr/local/lib -lz $(XML_LIBS) $(GLIB_LIBS)
+LIBS = -lm -lz $(XML_LIBS) $(GLIB_LIBS) $(INTL_LIBS)
 
 #### End of system configuration section. ####
 
@@ -73,14 +78,14 @@
 
 override CFLAGS += -I. -I./src -I.. $(XML_CFLAGS) $(GLIB_CFLAGS) -DHAVE_CONFIG_H
 
-COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS)
+COMPILE = $(LIBTOOL) --mode=compile $(CC) -c $(CFLAGS) $(CPPFLAGS)
 
 .c.o:        
 	$(COMPILE) $<
 
 $(LIBGRETL): $(OBJS) $(LOBJS) $(CEPHES_OBJ) $(CEPHES_OBJ)
 	$(LIBTOOL) --mode=link $(CC) -o $@ $(LOBJS) $(CEPHES_LOBJ) \
-	-rpath $(prefix)/lib $(LIBS) -version-info 0:2:0
+	-rpath $(prefix)/lib $(LIBS) -version-info 0:2:0 $(LDFLAGS)
 
 .PHONY: