X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=perl-module%2Fautomake.mk;h=ef9acc3790c8bc93e13b44dc89c3fcecc46cf3b3;hb=553dd6fd34f6ac129d51cf4736f89e349b97e16c;hp=9c30cef6aaab7add53412aa51504cef203d8faa8;hpb=bd17d2af982332ee1791998361b1ac6731fe14fa;p=pspp-builds.git

diff --git a/perl-module/automake.mk b/perl-module/automake.mk
index 9c30cef6..ef9acc37 100644
--- a/perl-module/automake.mk
+++ b/perl-module/automake.mk
@@ -16,20 +16,18 @@ module_sources = \
  perl-module/t/Pspp.t
 
 perl-module/pspp-module-config: Makefile
-	target=`mktemp`;\
-	echo '%Locations = (' > $$target ;\
-	printf "  SourceDir => '" >> $$target ;\
-	(cd $(top_srcdir) && echo `pwd`\', ) >> $$target ;\
-	printf "  BuildDir => '" >> $$target ;\
-	(cd $(top_builddir) && echo `pwd`\' ) >> $$target ;\
-	echo ');' >> $$target ;\
-	cp $$target $(top_builddir)/perl-module/pspp-module-config
+	(echo '%Locations = (';\
+	 printf "  SourceDir => '";\
+	 (cd $(top_srcdir) && echo `pwd`\', ) ;\
+	 printf "  BuildDir => '";\
+	 (cd $(top_builddir) && echo `pwd`\' );\
+	 echo ');') > $(top_builddir)/perl-module/pspp-module-config
 
 perl-module/Makefile: perl-module/Makefile.PL perl-module/pspp-module-config
 	cd perl-module && $(PERL) Makefile.PL PREFIX=$(prefix)
 
-perl-module/PSPP-Perl-$(VERSION).tar.gz: $(module_sources)
-	$(RM) $@
+perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz: $(module_sources)
+	rm -f $@
 	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) tardist
 
 PHONY += module-make
@@ -47,7 +45,7 @@ perl_module_tarball:
 	  fi ; \
 	 done \
 	fi
-	$(MAKE) $(AM_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION).tar.gz
+	$(MAKE) $(AM_MAKEFLAGS) module-make perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz
 
 ALL_LOCAL += perl_module_tarball
 
@@ -59,14 +57,14 @@ check-local:
 perl_module_CLEAN:
 	cd perl-module && $(MAKE) $(AM_MAKEFLAGS) clean || true
 	if test x"$(top_builddir)" != x"$(top_srcdir)" ; then \
-	  $(RM) $(module_sources) ; \
+	  rm -f $(module_sources) ; \
 	fi
-	$(RM) perl-module/Makefile.old
+	rm -f perl-module/Makefile.old
 
 CLEAN_LOCAL += perl_module_CLEAN
 
 CLEANFILES += \
-        perl-module/PSPP-Perl-$(VERSION).tar.gz \
+        perl-module/PSPP-Perl-$(VERSION_FOR_PERL).tar.gz \
 	perl-module/pspp-module-config \
 	perl-module/const-c.inc \
 	perl-module/const-xs.inc