summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-04-03 22:47:37 +0000
committerKarl Berry <karl@freefriends.org>2014-04-03 22:47:37 +0000
commitc3677ef2ed576e61f80f01036738e561b25ff2c1 (patch)
tree4f0b1ef773c409066e3b1a2e7a46206dce7e89be /Build
parentb4e5a8790343bc0d5312d3b47ce2b8d970dd333a (diff)
set both TL_MAKE and MAKE in all cases
git-svn-id: svn://tug.org/texlive/trunk@33362 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/source/Build25
-rw-r--r--Build/source/ChangeLog5
2 files changed, 21 insertions, 9 deletions
diff --git a/Build/source/Build b/Build/source/Build
index 15cd8abf9ca..ec26c40a7ca 100755
--- a/Build/source/Build
+++ b/Build/source/Build
@@ -26,7 +26,20 @@ if test -z "$TL_INSTALL_DEST"; then
fi
# allow override of the make program.
-: ${TL_MAKE=make}
+# The idea is to use TL_MAKE if that is defined (and set MAKE),
+# or MAKE if that is defined (and set TL_MAKE),
+# or default to "make" if neither is set.
+# We have to end up with both defined because TL_MAKE is used below
+# in this script, and MAKE is used throughout (in its usual way).
+if test -n "$TL_MAKE"; then
+ MAKE=$TL_MAKE
+elif test -n "$MAKE"; then
+ TL_MAKE=$MAKE
+else
+ TL_MAKE=make
+ MAKE=make
+fi
+export MAKE
# make flags
: ${TL_MAKE_FLAGS=}
@@ -34,10 +47,6 @@ fi
# allow override of make target.
: ${TL_TARGET=world}
-# set MAKE to $TL_MAKE for configure
-: ${MAKE=${TL_MAKE}}
-export MAKE
-
if test "x$1" = x--no-clean; then
shift
else
@@ -82,16 +91,13 @@ fi
# allow adding arbitrary other configure args, after all the others.
: ${TL_CONFIGURE_ARGS=}
-
# allow for doing stuff betwen configure and make.
: ${TL_POSTCONFIGURE=true}
-
# Kpathsea is not going to be able to find its cnf files during the
# build, so omit the warning about it.
: ${KPATHSEA_WARNING=0}
-
# make our working directory.
test -d $TL_WORKDIR || mkdir $TL_WORKDIR
cd $TL_WORKDIR || exit 1
@@ -101,9 +107,10 @@ cd $TL_WORKDIR || exit 1
{
echo "starting `date`"
echo "on `uname -a`"
+ echo "in `pwd`"
echo "$0 $*"
echo
- env | sort >buildenv.txt
+ env | sort >buildenv.log
#
set -vx # show the configure and make commands in the log.
diff --git a/Build/source/ChangeLog b/Build/source/ChangeLog
index e32d4c76e2c..eee5a98d947 100644
--- a/Build/source/ChangeLog
+++ b/Build/source/ChangeLog
@@ -1,3 +1,8 @@
+2014-04-04 Karl Berry <karl@tug.org>
+
+ * Build (TL_MAKE,MAKE): set both in all cases.
+ (buildenv.log): include pwd, and use .log instead of .txt.
+
2014-04-01 Peter Breitenlohner <peb@mppmu.mpg.de>
* tardate.ac: Switch to 2014-04-01.