work on remote builds

[pspp] / make-src-dist.as

diff --git a/make-src-dist.as b/make-src-dist.as
index 81d42eabe88bdb1cae48e0d94c71043fee7c85cc..2e491de997258b5cf0b736fe460e45b16c026d02 100644 (file)
--- a/make-src-dist.as
+++ b/make-src-dist.as
@@ -12,7 +12,7 @@ BP_SET_VAR([PSPP_COMMIT], [@PSPP_COMMIT@])
 BP_SET_VAR([GNULIB_COMMIT], [@GNULIB_COMMIT@])
 BP_SET_VAR([GNULIB_REPO], [@GNULIB_REPO@])
 
-ABBREV_COMMIT=`expr "$COMMIT" : '\(......\)'`
+ABBREV_COMMIT=`expr "$PSPP_COMMIT" : '\(......\)'`
 
 BP_START_STEP([Extracting Git sources])
 BP_RUN([(cd repo && zcat pspp-$PSPP_COMMIT.tar.gz | tar xf -) >&AS_MESSAGE_LOG_FD 2>&1])
@@ -46,9 +46,10 @@ BP_SET_VAR([VERSION])
 
 BP_START_STEP([Update version number in configure.ac])
 AS_ECHO(["AC_INIT([$PACKAGE], [$VERSION], [$BUG_REPORT], [$TARNAME], [$URL])]") > tmp$$
-sed -n "${LINE}r tmp$$
-$LINE!p" < repo/pspp-$PSPP_COMMIT/$FILE > repo/pspp-$PSPP_COMMIT/$FILE.new
-mv repo/pspp-$PSPP_COMMIT/$FILE.new repo/pspp-$PSPP_COMMIT/$FILE
+BP_RUN([sed -n "${LINE}r tmp$$
+$LINE!p" < repo/pspp-$PSPP_COMMIT/$FILE > repo/pspp-$PSPP_COMMIT/$FILE.new 2>&AS_MESSAGE_LOG_FD])
+BP_RUN([mv repo/pspp-$PSPP_COMMIT/$FILE.new repo/pspp-$PSPP_COMMIT/$FILE >&AS_MESSAGE_LOG_FD 2>&1])
+BP_RUN([rm tmp$$ >&AS_MESSAGE_LOG_FD 2>&1])
 
 BP_START_STEP([Updating NEWS])
 {
@@ -75,7 +76,7 @@ BP_RUN([(cd repo/pspp-$PSPP_COMMIT && make -f Smake GNULIB=../gnulib-$GNULIB_COM
 
 BP_START_STEP([Configure])
 mkdir repo/pspp-$PSPP_COMMIT/_dist
-BP_RUN([(cd repo/pspp-$PSPP_COMMIT/_dist && ../configure @CONFIGUREFLAGS@) >&AS_MESSAGE_LOG_FD 2>&1])
+BP_RUN([(cd repo/pspp-$PSPP_COMMIT/_dist && ../configure) >&AS_MESSAGE_LOG_FD 2>&1])
 
 BP_START_STEP([Make source tarball])
 BP_RUN([(cd repo/pspp-$PSPP_COMMIT/_dist && make dist) >&AS_MESSAGE_LOG_FD 2>&1])