Do not treat isolated CR in input data as new-line.

[pspp] / Smake

diff --git a/Smake b/Smake
index 686fb756278834a9aafbce869972f97af42cedd0..d6ebd795bf78db820bd6ceffe2e5d2516ef95979 100644 (file)
--- a/Smake
+++ b/Smake
@@ -10,6 +10,7 @@ GNULIB_MODULES = \
        c-ctype \
        c-strtod \
        close \
+       configmake \
        count-one-bits \
        crc \
        crypto/md4 \
@@ -97,13 +98,11 @@ GNULIB_MODULES = \
 all: 
        test -e ChangeLog || touch ChangeLog
        test -d m4 || mkdir m4
-       echo '*' > m4/.cvsignore
        touch m4/Makefile.am
        $(GNULIB_TOOL) --import --no-changelog --m4-base=gl/m4 \
                --source-base=gl --lib=libgl --tests-base=tests \
-               --doc-base=gl/doc --aux-dir=. --import $(GNULIB_MODULES)
-       echo '*' > gl/.cvsignore
-       echo '*' > gl/m4/.cvsignore
+               --doc-base=gl/doc --aux-dir=build-aux --import \
+               $(GNULIB_MODULES)
        libtoolize --force --automake
        aclocal -I m4 -I gl/m4
        autoconf
@@ -138,7 +137,6 @@ po/Makevars.template po/pspp.pot
 
 clean:
        rm -f config.sub config.guess config.rpath
-       rm -f ABOUT-NLS
        rm -fr autom4te.cache
        rm -f aclocal.m4
        rm -f missing mkinstalldirs