summaryrefslogtreecommitdiff
path: root/Build/source/m4
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2014-12-07 13:04:51 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2014-12-07 13:04:51 +0000
commitd4aa787bcd1653b8870badb2daca7807c707b131 (patch)
tree57294f37e38a9bebef2fefd8840b88a295285e1f /Build/source/m4
parent997df6b25d88565f035347d581ca699cbf2c5938 (diff)
freetype 2.5.4
git-svn-id: svn://tug.org/texlive/trunk@35761 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/m4')
-rw-r--r--Build/source/m4/ChangeLog4
-rw-r--r--Build/source/m4/kpse-options.m48
2 files changed, 7 insertions, 5 deletions
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index 1c8a9e2450a..bf616b32a8d 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-06 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * kpse-options.m4: Set platform name to ${host_alias-$host}.
+
2014-12-05 Peter Breitenlohner <peb@mppmu.mpg.de>
* kpse-luajit-flags.m4: LuaJIT is now a Libtool library.
diff --git a/Build/source/m4/kpse-options.m4 b/Build/source/m4/kpse-options.m4
index a96edab08c3..32e5a0eccd4 100644
--- a/Build/source/m4/kpse-options.m4
+++ b/Build/source/m4/kpse-options.m4
@@ -1,12 +1,10 @@
# Public macros for the TeX Live (TL) tree.
-# Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+# Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
#
# This file is free software; the copyright holder
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-# serial 0
-
# KPSE_OPTIONS
# ------------
# Provide configure options used by the higher level TL directories
@@ -18,11 +16,11 @@ AC_ARG_ENABLE([multiplatform],
[put executables into bin/PLATFORM and libraries into lib/PLATFORM]))[]dnl
if test "x$enable_multiplatform" = xyes; then
if test "x$bindir" = 'x${exec_prefix}/bin'; then
- bindir="$bindir/$host"
+ bindir="$bindir/${host_alias-$host}"
ac_configure_args="$ac_configure_args '--bindir=$bindir'"
fi
if test "x$libdir" = 'x${exec_prefix}/lib'; then
- libdir="$libdir/$host"
+ libdir="$libdir/${host_alias-$host}"
ac_configure_args="$ac_configure_args '--libdir=$libdir'"
fi
fi