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.)
AM_CPPFLAGS = \
-I$(top_srcdir)/gl \
-I$(top_builddir)/gl \
AM_CPPFLAGS = \
-I$(top_srcdir)/gl \
-I$(top_builddir)/gl \
- -DINSTALLDIR=\"$(bindir)\" \
- -DDOCDIR=\"$(docdir)\"
+ -DINSTALLDIR=\"$(bindir)\"
c-ctype \
c-strtod \
close \
c-ctype \
c-strtod \
close \
count-one-bits \
crc \
crypto/md4 \
count-one-bits \
crc \
crypto/md4 \
-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
lib_LTLIBRARIES = src/libpspp-core.la src/libpspp.la
#include "libpspp/str.h"
#include "libpspp/string-array.h"
#include "libpspp/str.h"
#include "libpspp/string-array.h"
+#include "gl/configmake.h"
#include "gl/relocatable.h"
#include "gl/xalloc.h"
#include "gl/relocatable.h"
#include "gl/xalloc.h"
/* PSPPIRE - a graphical user interface for PSPP.
/* 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
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
#include "about.h"
#include "helper.h"
#include "about.h"
#include "helper.h"
+#include "gl/configmake.h"
+
#include <gettext.h>
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
#include <gettext.h>
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
#include "psppire-data-store.h"
#include "psppire-data-store.h"
+#include "gl/configmake.h"
#include "xalloc.h"
#include <gettext.h>
#include "xalloc.h"
#include <gettext.h>
/* PSPPIRE - a graphical user interface for PSPP.
/* 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
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
#include "psppire-dict.h"
#include "psppire-dict.h"
+#include "gl/configmake.h"
+
void paste_syntax_in_new_window (const gchar *syntax);
struct fmt_spec;
void paste_syntax_in_new_window (const gchar *syntax);
struct fmt_spec;
#include "libpspp/copyleft.h"
#include "ui/source-init-opts.h"
#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"
#include "gl/progname.h"
#include "gl/relocatable.h"
#include "gl/xalloc.h"
#include "ui/source-init-opts.h"
#include "ui/syntax-gen.h"
#include "ui/source-init-opts.h"
#include "ui/syntax-gen.h"
+#include "gl/configmake.h"
#include "gl/xalloc.h"
#include "gl/relocatable.h"
#include "gl/xalloc.h"
#include "gl/relocatable.h"