X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Smake;h=597baea4f256a131385bb5559c77ae734dd6aae2;hb=5ae2fd5298d9c40f28ffcad764f1f1cf3489ff16;hp=0b64221ca2c16358f80b1c2cef5b94e5e9e9ed4a;hpb=a3e57d44a2c49305a1f6ba5652a0ca0a83123c48;p=pspp

diff --git a/Smake b/Smake
index 0b64221ca2..597baea4f2 100644
--- a/Smake
+++ b/Smake
@@ -336,7 +336,8 @@ prep_ph:
 	touch build-aux/config.rpath
 	$(GNULIB_TOOL) --add-import --no-changelog --m4-base=gl/m4 \
 		--source-base=gl --lib=libgl --tests-base=tests \
-		--doc-base=gl/doc --aux-dir=build-aux  \
+		--doc-base=gl/doc --aux-dir=build-aux \
+		--makefile-name=automake.mk --automake-subdir \
 		--libtool $(GNULIB_MODULES)
 	if (glibtoolize --version) >/dev/null 2>&1; then	\
 		LIBTOOLIZE=glibtoolize;				\
@@ -404,6 +405,7 @@ clean: clean-icons
 	rm -f config.h.in~
 	rm -f config.h.in
 	rm -f gl/Makefile.in
+	rm -f gl/automake.mk
 	rm -f Makefile.in
 	rm -f build-aux/compile
 	rm -f build-aux/ltmain.sh