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

[pspp] / Smake

diff --git a/Smake b/Smake
index 22c0f692de0638be8e8d5405da76d573837086e2..d6ebd795bf78db820bd6ceffe2e5d2516ef95979 100644 (file)
--- a/Smake
+++ b/Smake
@@ -98,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