expressions: Improve error message for bad quarter argument to DATE.QYR.

[pspp] / src / automake.mk

diff --git a/src/automake.mk b/src/automake.mk
index 56f7590410f8d042761b9cdbf64949d219c4c669..cfd3a9f5a8114acebd63f6d7f63c8a28534250f0 100644 (file)
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -7,14 +7,14 @@ include $(top_srcdir)/src/data/automake.mk
 
 
 
-AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_srcdir)/lib -DPKGDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_srcdir)/lib
 
 
 lib_LTLIBRARIES = src/libpspp-core.la src/libpspp.la
 src_libpspp_core_la_SOURCES = 
 
 
-src_libpspp_core_la_LDFLAGS = -release @VERSION@
+src_libpspp_core_la_LDFLAGS = -release $(VERSION)
 
 src_libpspp_core_la_LIBADD = \
        src/data/libdata.la \
@@ -24,12 +24,14 @@ src_libpspp_core_la_LIBADD = \
 
 src_libpspp_la_SOURCES = 
 
-src_libpspp_la_LDFLAGS = -release @VERSION@
+src_libpspp_la_CFLAGS = $(GSL_CFLAGS)
+src_libpspp_la_LDFLAGS = -release $(VERSION)
 
 src_libpspp_la_LIBADD = \
        src/language/liblanguage.la \
        src/math/libpspp-math.la \
        src/output/liboutput.la \
+        $(GSL_LIBS) \
        gl/libgl.la