Take advantage of Gnulib configmake module.

Gnulib provides the "configmake" module for discovering configuration
directories at build time.  PSPP already depends on this module indirectly,
so we might as well use it instead of defining our own variables in
Makefile.am and src/automake.mk.

(We can't replace INSTALLDIR by BINDIR because it is used under the
former name by the "relocatable-prog" module.)

diff --git a/Makefile.am b/Makefile.am
index bebd2ab5ab4d13edc5dadfeef7bc3f36e7b00286..78790a431da0dae13e2487c3ce7a8c82ce517ab7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,7 @@ BUILT_SOURCES =
 AM_CPPFLAGS = \
        -I$(top_srcdir)/gl \
        -I$(top_builddir)/gl \
-       -DINSTALLDIR=\"$(bindir)\" \
-       -DDOCDIR=\"$(docdir)\"
+       -DINSTALLDIR=\"$(bindir)\"
 
 AM_CFLAGS=
 

diff --git a/Smake b/Smake
index 7ee5585c5e009d48b6d98cd391e9c2c0c96f53c6..22c0f692de0638be8e8d5405da76d573837086e2 100644 (file)
--- a/Smake
+++ b/Smake
@@ -10,6 +10,7 @@ GNULIB_MODULES = \
        c-ctype \
        c-strtod \
        close \
+       configmake \
        count-one-bits \
        crc \
        crypto/md4 \

diff --git a/src/automake.mk b/src/automake.mk
index 46e0ef73403f1cbd7dd097c0361b692c6aeaaff9..65806fd442ed28bb83d9d674cbe5932355881a49 100644 (file)
--- a/src/automake.mk
+++ b/src/automake.mk
@@ -7,7 +7,7 @@ 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

diff --git a/src/libpspp/getl.c b/src/libpspp/getl.c
index dc69f11a12a2b45e9ecf77c5dd89a00e5c69e18e..43d2a56f460d8f645a61ee86dc5e457c862a9efc 100644 (file)
--- a/src/libpspp/getl.c
+++ b/src/libpspp/getl.c
@@ -24,6 +24,7 @@
 #include "libpspp/str.h"
 #include "libpspp/string-array.h"
 
+#include "gl/configmake.h"
 #include "gl/relocatable.h"
 #include "gl/xalloc.h"
 

diff --git a/src/ui/gui/about.c b/src/ui/gui/about.c
index 85185b3931f47633c7d943b3731d5db30df95f49..5b606bf5ab1c42130c56fddc53cca6b128ac22bb 100644 (file)
--- a/src/ui/gui/about.c
+++ b/src/ui/gui/about.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2006, 2007  Free Software Foundation
+   Copyright (C) 2006, 2007, 2010  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -24,6 +24,8 @@
 #include "about.h"
 #include "helper.h"
 
+#include "gl/configmake.h"
+
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid

diff --git a/src/ui/gui/helper.c b/src/ui/gui/helper.c
index a0d753b5d6668bd1d204981f4b4c023824716170..3be3981388e46c4a3a17c32b81061cd64ac180d4 100644 (file)
--- a/src/ui/gui/helper.c
+++ b/src/ui/gui/helper.c
@@ -41,6 +41,7 @@
 
 #include "psppire-data-store.h"
 
+#include "gl/configmake.h"
 #include "xalloc.h"
 
 #include <gettext.h>

diff --git a/src/ui/gui/helper.h b/src/ui/gui/helper.h
index 223b613447e2af5876dc463be4ca7b166c0e9232..671bb8edf633649aa63e07843f1103da8369d995 100644 (file)
--- a/src/ui/gui/helper.h
+++ b/src/ui/gui/helper.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2004, 2009  Free Software Foundation
+   Copyright (C) 2004, 2009, 2010  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,6 +27,8 @@
 
 #include "psppire-dict.h"
 
+#include "gl/configmake.h"
+
 void paste_syntax_in_new_window (const gchar *syntax);
 
 struct fmt_spec;

diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c
index e0e680f30b5e621b6b21b320b652918519f17f88..7c952283a8128055a0b5da6fb3a5ca4887f6c921 100644 (file)
--- a/src/ui/gui/main.c
+++ b/src/ui/gui/main.c
@@ -28,6 +28,7 @@
 #include "libpspp/copyleft.h"
 #include "ui/source-init-opts.h"
 
+#include "gl/configmake.h"
 #include "gl/progname.h"
 #include "gl/relocatable.h"
 #include "gl/xalloc.h"

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index e61269164046cfaa6792f2ece2b390d2d23bc3b9..d75bff359b1d33aac4b0d8f177a259e47d014903 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -56,6 +56,7 @@
 #include "ui/source-init-opts.h"
 #include "ui/syntax-gen.h"
 
+#include "gl/configmake.h"
 #include "gl/xalloc.h"
 #include "gl/relocatable.h"