* Makefile.am (AUTOMAKE_OPTIONS): Require Automake 1.10 (or

later), which works better with systems that have a non-empty
$(EXEEXT).
(SUBDIRS): Drop intl.
(DISTCLEANFILES): Drop intl/plural.c.

* Throughout Makefile.am and the automake.mk files: Change
mkinstalldirs to $(MKDIR_P), to support the corresponding Automake
change.

* Smake (GNULIB_MODULES): Use gettext-h instead of gettext module.
(all): Don't create intl directory.
(gettextize): Don't use --intl flag.

* configure.ac: Require Autoconf 2.60 or later.  Use external
gettext.  Drop intl/Makefile from config files.

diff --git a/ChangeLog b/ChangeLog
index 57f6461d31d2d5fdd9803790843f06a17c905c9c..f4aa9fa563ec4bd99ca47a0bb10e89994ba56e21 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2007-03-19  Ben Pfaff  <blp@gnu.org>
+
+       Work toward modernizing the build system by updating our Automake
+       and Autoconf dependencies and requiring libintl to be available
+       externally (if desired) instead of including a copy in the
+       distribution.
+
+       * Makefile.am (AUTOMAKE_OPTIONS): Require Automake 1.10 (or
+       later), which works better with systems that have a non-empty
+       $(EXEEXT).
+       (SUBDIRS): Drop intl.
+       (DISTCLEANFILES): Drop intl/plural.c.
+
+       * Throughout Makefile.am and the automake.mk files: Change
+       mkinstalldirs to $(MKDIR_P), to support the corresponding Automake
+       change.
+
+       * Smake (GNULIB_MODULES): Use gettext-h instead of gettext module.
+       (all): Don't create intl directory.
+       (gettextize): Don't use --intl flag.
+
+       * configure.ac: Require Autoconf 2.60 or later.  Use external
+       gettext.  Drop intl/Makefile from config files.
+

 2007-02-25  Ben Pfaff  <blp@gnu.org>
 
        Thanks to Jason Stover for verifying that this patch helps under
 2007-02-25  Ben Pfaff  <blp@gnu.org>
 
        Thanks to Jason Stover for verifying that this patch helps under

diff --git a/Makefile.am b/Makefile.am
index d02ed4e19ad90897805063ed551b97b18b963de3..9a242a31e3168fe058b600c1336b8bc28132ee9a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,12 @@
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 
 ## Process this file with automake to produce Makefile.in  -*- makefile -*-
 

-AUTOMAKE_OPTIONS = gnits 1.7 subdir-objects
+AUTOMAKE_OPTIONS = gnits 1.10 subdir-objects

 
 

-SUBDIRS = intl gl po
-DISTCLEANFILES = ./intl/plural.c ./po/stamp-po
+SUBDIRS = gl po
+DISTCLEANFILES = ./po/stamp-po

 BUILT_SOURCES =
 
 BUILT_SOURCES =
 

-AM_CPPFLAGS=-I$(top_srcdir)/intl -I$(top_builddir)/intl \
-       -I$(top_srcdir)/gl -I$(top_builddir)/gl
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl

 
 AM_CFLAGS=
 
 
 AM_CFLAGS=
 


@@ -19,7 +18,7 @@ endif
 CC_FOR_BUILD = @CC_FOR_BUILD@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 .q.c:
 CC_FOR_BUILD = @CC_FOR_BUILD@
 EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
 .q.c:

-       @$(top_srcdir)/mkinstalldirs  `dirname $@`
+       @$(MKDIR_P) `dirname $@`

        ./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@
 
 $(all_q_sources:.q=.c): src/language/lexer/q2c$(EXEEXT_FOR_BUILD)
        ./src/language/lexer/q2c$(EXEEXT_FOR_BUILD) $< $@
 
 $(all_q_sources:.q=.c): src/language/lexer/q2c$(EXEEXT_FOR_BUILD)

diff --git a/NEWS b/NEWS
index f1b81ce447be71a7cb9c3971a6877602a49361ac..a76d9e7b75527edbd3f08a46397db69ccd05f938 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,5 @@
 PSPP NEWS -- history of user-visible changes.
 PSPP NEWS -- history of user-visible changes.

-Time-stamp: <2007-03-01 17:11:36 blp>
+Time-stamp: <2007-03-01 17:13:42 blp>

 Copyright (C) 1996-9, 2000 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Copyright (C) 1996-9, 2000 Free Software Foundation, Inc.
 See the end for copying conditions.
 


@@ -16,6 +16,9 @@ Changes since 0.4.2:
   The PROCESS IF command, which was deprecated, has been removed.  You
   may replace any usage of it by SELECT IF following TEMPORARY, which
   has the same effect.
   The PROCESS IF command, which was deprecated, has been removed.  You
   may replace any usage of it by SELECT IF following TEMPORARY, which
   has the same effect.

+
+  For developers, the build system now requires Autoconf 2.60 and
+  Automake 1.10.

 \f
 Changes since 0.4.0 to 0.4.1:
 
 \f
 Changes since 0.4.0 to 0.4.1:
 

diff --git a/Smake b/Smake
index 2b1286283ddd8a8774360fb4e8e7d06d0932ec06..c31240a12595225809d215e6168868cb7137c1da 100644 (file)
--- a/Smake
+++ b/Smake
@@ -19,7 +19,7 @@ GNULIB_MODULES = \
        getline \
        getlogin_r \
        getopt \
        getline \
        getlogin_r \
        getopt \

-       gettext \
+       gettext-h \

        intprops \
        inttostr \
        linebreak \
        intprops \
        inttostr \
        linebreak \


@@ -69,8 +69,6 @@ all: po/POTFILES.in
                --doc-base=gl/doc --import $(GNULIB_MODULES)
        echo '*' > gl/.cvsignore
        echo '*' > gl/m4/.cvsignore
                --doc-base=gl/doc --import $(GNULIB_MODULES)
        echo '*' > gl/.cvsignore
        echo '*' > gl/m4/.cvsignore

-       test -d intl || mkdir intl
-       echo '*' > intl/.cvsignore

        libtoolize --force --automake
        autopoint --force
        aclocal -I m4 -I gl/m4
        libtoolize --force --automake
        autopoint --force
        aclocal -I m4 -I gl/m4


@@ -81,7 +79,7 @@ all: po/POTFILES.in
 gettextize:
        test -d m4 || mkdir m4
        touch m4/Makefile.am
 gettextize:
        test -d m4 || mkdir m4
        touch m4/Makefile.am

-       gettextize -f -c --intl --no-changelog
+       gettextize --force --no-changelog

 
 po/POTFILES.in:
        for f in `find src \( -name \*.[qc] -o -name \*.glade \) ! -name .\* -print` ; do \
 
 po/POTFILES.in:
        for f in `find src \( -name \*.[qc] -o -name \*.glade \) ! -name .\* -print` ; do \

diff --git a/configure.ac b/configure.ac
index fec518d4f70da80657395c5883cd9381944a0dfb..14436fed7617a6f30e8b1b9682f7b8bef8fe156b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.
 dnl Process this file with autoconf to produce a configure script.
 
 dnl Initialize.

-AX_PREREQ(2.57)
+AX_PREREQ(2.60)

 AC_INIT(pspp, 0.4.2,bug-gnu-pspp@gnu.org)
 AC_CONFIG_HEADERS([config.h])
 AC_INIT(pspp, 0.4.2,bug-gnu-pspp@gnu.org)
 AC_CONFIG_HEADERS([config.h])

-AM_INIT_AUTOMAKE(1.9)
+AM_INIT_AUTOMAKE

 
 dnl Checks for programs.
 AC_GNU_SOURCE
 
 dnl Checks for programs.
 AC_GNU_SOURCE


@@ -23,8 +23,8 @@ PSPP_CC_FOR_BUILD
 PSPP_PERL
 
 dnl Internationalization macros.
 PSPP_PERL
 
 dnl Internationalization macros.

-AM_GNU_GETTEXT
-AM_GNU_GETTEXT_VERSION([0.14.5])
+AM_GNU_GETTEXT([external], [need-ngettext])
+AM_GNU_GETTEXT_VERSION([0.16.1])

 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE
 
 dnl Checks for libraries.
 AC_SYS_LARGEFILE


@@ -100,7 +100,7 @@ fi
 
 PSPP_CHECK_PREREQS
 
 
 PSPP_CHECK_PREREQS
 

-AC_CONFIG_FILES([Makefile gl/Makefile intl/Makefile po/Makefile.in])
+AC_CONFIG_FILES([Makefile gl/Makefile po/Makefile.in])

 
 AC_OUTPUT
 
 
 AC_OUTPUT
 

diff --git a/doc/automake.mk b/doc/automake.mk
index 0bebded816d5ebd9521df1f2ce39b72523d88480..301757c8b71f105e159bbea2d24c29ee4eef5c7f 100644 (file)
--- a/doc/automake.mk
+++ b/doc/automake.mk
@@ -35,5 +35,5 @@ EXTRA_DIST += doc/pspp.man \
        $(doc_pspp_TEXINFOS)
 
 doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl
        $(doc_pspp_TEXINFOS)
 
 doc/ni.texi: $(top_srcdir)/src/language/command.def doc/get-commands.pl

-       @$(top_srcdir)/mkinstalldirs  doc
+       @$(MKDIR_P)  doc

        @PERL@ $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@
        @PERL@ $(top_srcdir)/doc/get-commands.pl $(top_srcdir)/src/language/command.def > $@

diff --git a/po/de.po b/po/de.po
index 990022eb672c85a02a1a05c8aa6e0cbd323eae2e..d4dfbc05b3d757bde9b0b7804cc2eb7aac5a09f5 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PSPP 0.4.2\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
 msgstr ""
 "Project-Id-Version: PSPP 0.4.2\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"

-"POT-Creation-Date: 2007-03-17 21:13+0900\n"
+"POT-Creation-Date: 2007-03-19 13:38-0700\n"

 "PO-Revision-Date: 2006-05-26 17:49+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: German <pspp-dev@gnu.org>\n"
 "PO-Revision-Date: 2006-05-26 17:49+0800\n"
 "Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
 "Language-Team: German <pspp-dev@gnu.org>\n"


@@ -1367,6 +1367,20 @@ msgid ""
 "Data fields must be listed in order of increasing record number."
 msgstr ""
 
 "Data fields must be listed in order of increasing record number."
 msgstr ""
 

+#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
+#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+

 #: src/language/data-io/print.c:260
 #, c-format
 msgid "Output calls for %d records but %u specified on RECORDS subcommand."
 #: src/language/data-io/print.c:260
 #, c-format
 msgid "Output calls for %d records but %u specified on RECORDS subcommand."


@@ -1386,20 +1400,6 @@ msgid_plural "Writing %d records."
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
-#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-

 #: src/language/dictionary/apply-dictionary.c:74
 #, c-format
 msgid "Variable %s is %s in target file, but %s in source file."
 #: src/language/dictionary/apply-dictionary.c:74
 #, c-format
 msgid "Variable %s is %s in target file, but %s in source file."


@@ -3018,6 +3018,22 @@ msgstr ""
 msgid "TABLES subcommand may not appear more than once."
 msgstr ""
 
 msgid "TABLES subcommand may not appear more than once."
 msgstr ""
 

+#: src/language/stats/npar-summary.c:110
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:147
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:150
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:153
+msgid "75th"
+msgstr ""
+

 #: src/language/stats/npar.q:101
 msgid "NPAR subcommand not currently implemented."
 msgstr ""
 #: src/language/stats/npar.q:101
 msgid "NPAR subcommand not currently implemented."
 msgstr ""


@@ -3042,22 +3058,6 @@ msgid ""
 "match the number following (%d)."
 msgstr ""
 
 "match the number following (%d)."
 msgstr ""
 

-#: src/language/stats/npar-summary.c:110
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:147
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:150
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:153
-msgid "75th"
-msgstr ""
-

 #: src/language/stats/oneway.q:169
 msgid "Number of contrast coefficients must equal the number of groups"
 msgstr ""
 #: src/language/stats/oneway.q:169
 msgid "Number of contrast coefficients must equal the number of groups"
 msgstr ""


@@ -4601,6 +4601,18 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
 msgid "%d"
 msgstr ""
 

+#: src/ui/gui/psppire-var-store.c:470
+msgid "None"
+msgstr "Keine"
+
+#: src/ui/gui/psppire-var-store.c:477
+msgid "Scientific"
+msgstr "Wissenschäflich"
+
+#: src/ui/gui/psppire-var-store.c:480
+msgid "Custom"
+msgstr "Spezial"
+

 #: src/ui/gui/psppire.glade:9
 #, fuzzy
 msgid "This is pre-alpha software.  Use at your own risk."
 #: src/ui/gui/psppire.glade:9
 #, fuzzy
 msgid "This is pre-alpha software.  Use at your own risk."


@@ -4651,18 +4663,6 @@ msgstr "Variableansicht"
 msgid "Variable(s):"
 msgstr "Variableansicht"
 
 msgid "Variable(s):"
 msgstr "Variableansicht"
 

-#: src/ui/gui/psppire-var-store.c:470
-msgid "None"
-msgstr "Keine"
-
-#: src/ui/gui/psppire-var-store.c:477
-msgid "Scientific"
-msgstr "Wissenschäflich"
-
-#: src/ui/gui/psppire-var-store.c:480
-msgid "Custom"
-msgstr "Spezial"
-

 #: src/ui/gui/sort-cases-dialog.c:367
 msgid "Criteria"
 msgstr ""
 #: src/ui/gui/sort-cases-dialog.c:367
 msgid "Criteria"
 msgstr ""

diff --git a/po/pspp.pot b/po/pspp.pot
index d5f363404ba907aefdaf68d7f4422cc14e9aec3f..d970be00d91dc923669d489e67b2a670189f3431 100644 (file)
--- a/po/pspp.pot
+++ b/po/pspp.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"

-"POT-Creation-Date: 2007-03-17 21:13+0900\n"
+"POT-Creation-Date: 2007-03-19 13:38-0700\n"

 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"


@@ -1362,6 +1362,20 @@ msgid ""
 "Data fields must be listed in order of increasing record number."
 msgstr ""
 
 "Data fields must be listed in order of increasing record number."
 msgstr ""
 

+#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
+#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+

 #: src/language/data-io/print.c:260
 #, c-format
 msgid "Output calls for %d records but %u specified on RECORDS subcommand."
 #: src/language/data-io/print.c:260
 #, c-format
 msgid "Output calls for %d records but %u specified on RECORDS subcommand."


@@ -1381,20 +1395,6 @@ msgid_plural "Writing %d records."
 msgstr[0] ""
 msgstr[1] ""
 
 msgstr[0] ""
 msgstr[1] ""
 

-#: src/language/data-io/print-space.c:75 src/language/lexer/lexer.c:465
-#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-

 #: src/language/dictionary/apply-dictionary.c:74
 #, c-format
 msgid "Variable %s is %s in target file, but %s in source file."
 #: src/language/dictionary/apply-dictionary.c:74
 #, c-format
 msgid "Variable %s is %s in target file, but %s in source file."


@@ -3012,6 +3012,22 @@ msgstr ""
 msgid "TABLES subcommand may not appear more than once."
 msgstr ""
 
 msgid "TABLES subcommand may not appear more than once."
 msgstr ""
 

+#: src/language/stats/npar-summary.c:110
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:147
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:150
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:153
+msgid "75th"
+msgstr ""
+

 #: src/language/stats/npar.q:101
 msgid "NPAR subcommand not currently implemented."
 msgstr ""
 #: src/language/stats/npar.q:101
 msgid "NPAR subcommand not currently implemented."
 msgstr ""


@@ -3036,22 +3052,6 @@ msgid ""
 "match the number following (%d)."
 msgstr ""
 
 "match the number following (%d)."
 msgstr ""
 

-#: src/language/stats/npar-summary.c:110
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:147
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:150
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:153
-msgid "75th"
-msgstr ""
-

 #: src/language/stats/oneway.q:169
 msgid "Number of contrast coefficients must equal the number of groups"
 msgstr ""
 #: src/language/stats/oneway.q:169
 msgid "Number of contrast coefficients must equal the number of groups"
 msgstr ""


@@ -4578,6 +4578,18 @@ msgstr ""
 msgid "%d"
 msgstr ""
 
 msgid "%d"
 msgstr ""
 

+#: src/ui/gui/psppire-var-store.c:470
+msgid "None"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:477
+msgid "Scientific"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:480
+msgid "Custom"
+msgstr ""
+

 #: src/ui/gui/psppire.glade:9
 msgid "This is pre-alpha software.  Use at your own risk."
 msgstr ""
 #: src/ui/gui/psppire.glade:9
 msgid "This is pre-alpha software.  Use at your own risk."
 msgstr ""


@@ -4624,18 +4636,6 @@ msgstr ""
 msgid "Variable(s):"
 msgstr ""
 
 msgid "Variable(s):"
 msgstr ""
 

-#: src/ui/gui/psppire-var-store.c:470
-msgid "None"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:477
-msgid "Scientific"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:480
-msgid "Custom"
-msgstr ""
-

 #: src/ui/gui/sort-cases-dialog.c:367
 msgid "Criteria"
 msgstr ""
 #: src/ui/gui/sort-cases-dialog.c:367
 msgid "Criteria"
 msgstr ""

diff --git a/src/language/expressions/automake.mk b/src/language/expressions/automake.mk
index 79e875528d61687a42156ee97e616ef39bca754b..630445dfb7999862c4f4aae606ea3235e618721e 100644 (file)
--- a/src/language/expressions/automake.mk
+++ b/src/language/expressions/automake.mk
@@ -29,7 +29,7 @@ AM_CPPFLAGS += -I$(top_builddir)/src/language/expressions \
 
 SUFFIXES = .h.pl .inc.pl
 
 
 SUFFIXES = .h.pl .inc.pl
 

-generate_from_pl = $(top_srcdir)/mkinstalldirs `dirname $@` && \
+generate_from_pl = $(MKDIR_P) `dirname $@` && \

        $(PERL) -I $(top_srcdir)/src/language/expressions $< -o $@ -i $(top_srcdir)/src/language/expressions/operations.def
 
 .h.pl.h:
        $(PERL) -I $(top_srcdir)/src/language/expressions $< -o $@ -i $(top_srcdir)/src/language/expressions/operations.def
 
 .h.pl.h:

diff --git a/src/language/lexer/automake.mk b/src/language/lexer/automake.mk
index a82114e186f85fcb244ce86ac62b7904876344c0..f8d6996349752cb186cb31b040022d533710bb64 100644 (file)
--- a/src/language/lexer/automake.mk
+++ b/src/language/lexer/automake.mk
@@ -16,7 +16,7 @@ EXTRA_DIST += src/language/lexer/q2c.c
 
 
 src/language/lexer/q2c$(EXEEXT_FOR_BUILD): $(top_srcdir)/src/language/lexer/q2c.c 
 
 
 src/language/lexer/q2c$(EXEEXT_FOR_BUILD): $(top_srcdir)/src/language/lexer/q2c.c 

-       @$(top_srcdir)/mkinstalldirs `dirname $@`
+       @$(MKDIR_P) `dirname $@`

        $(CC_FOR_BUILD) $(top_srcdir)/src/language/lexer/q2c.c -o $(top_builddir)/src/language/lexer/q2c
 
 
        $(CC_FOR_BUILD) $(top_srcdir)/src/language/lexer/q2c.c -o $(top_builddir)/src/language/lexer/q2c
 
 

diff --git a/src/libpspp/automake.mk b/src/libpspp/automake.mk
index c8368e8c985c36d91d151e89bf98681b4a677f9a..d9786900de900644079e89108942be7f4281f2c1 100644 (file)
--- a/src/libpspp/automake.mk
+++ b/src/libpspp/automake.mk
@@ -63,7 +63,7 @@ src_libpspp_libpspp_a_CPPFLAGS = -I $(top_srcdir)/src/libpspp $(AM_CPPFLAGS)
 nodist_src_libpspp_libpspp_a_SOURCES = src/libpspp/version.c
 
 src/libpspp/version.c: $(top_srcdir)/AUTHORS
 nodist_src_libpspp_libpspp_a_SOURCES = src/libpspp/version.c
 
 src/libpspp/version.c: $(top_srcdir)/AUTHORS

-       @$(top_srcdir)/mkinstalldirs  src/libpspp
+       @$(MKDIR_P) src/libpspp

        echo "/*        -*- mode: c; buffer-read-only: t -*-" > $@
        echo "   Generated by src/libpspp/automake.mk --- Do not edit. */">> $@
        echo "#include \"version.h\"" >> $@
        echo "/*        -*- mode: c; buffer-read-only: t -*-" > $@
        echo "   Generated by src/libpspp/automake.mk --- Do not edit. */">> $@
        echo "#include \"version.h\"" >> $@