summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2009-11-21 02:23:01 +0000
committerKarl Berry <karl@freefriends.org>2009-11-21 02:23:01 +0000
commita06a5b49b5f7c701aee7a5b65c6970ba7f00ba06 (patch)
tree202b71a27a7b4a55bc361a9e4faeaa12c2aba6a3 /Master
parentd83f3e0e9269fd384b0c7d6cc796750724c692c1 (diff)
/home/texlive/karl/Master/tlpkg/bin/tl-update-auto
git-svn-id: svn://tug.org/texlive/trunk@16108 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/doc.html3
-rwxr-xr-xMaster/tlpkg/installer/config.guess22
2 files changed, 14 insertions, 11 deletions
diff --git a/Master/doc.html b/Master/doc.html
index 60cbf6392f9..b9ecebc7014 100644
--- a/Master/doc.html
+++ b/Master/doc.html
@@ -5078,8 +5078,7 @@ A user-friendly interface to pdf annotations.
<li><b><a href="texmf-dist/doc/latex/pdfmarginpar">pdfmarginpar</a></b>:<small>
Generate marginpar-equivalent PDF annotations.
-<a href="texmf-dist/doc/latex/pdfmarginpar/pdfmarginpar.pdf">pdfmarginpar.pdf</a>,
-<a href="texmf-dist/doc/latex/pdfmarginpar/pdfmarginparexample.pdf">pdfmarginparexample.pdf</a>.
+<a href="texmf-dist/doc/latex/pdfmarginpar/pdfmarginpar.pdf">pdfmarginpar.pdf</a>.
</small></li>
<li><b><a href="texmf-dist/doc/latex/pdfpages">pdfpages</a></b>:<small>
diff --git a/Master/tlpkg/installer/config.guess b/Master/tlpkg/installer/config.guess
index e792aac6080..d53e309f4b9 100755
--- a/Master/tlpkg/installer/config.guess
+++ b/Master/tlpkg/installer/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
# Free Software Foundation, Inc.
-timestamp='2009-09-18'
+timestamp='2009-11-19'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -807,12 +807,12 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- *:Interix*:[3456]*)
+ *:Interix*:*)
case ${UNAME_MACHINE} in
x86)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T | authenticamd | genuineintel)
+ authenticamd | genuineintel | EM64T)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
IA64)
@@ -891,7 +891,15 @@ EOF
echo frv-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
- echo ${UNAME_MACHINE}-pc-linux-gnu
+ LIBC=gnu
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -918,11 +926,7 @@ EOF
#endif
#endif
EOF
- eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
- /^CPU/{
- s: ::g
- p
- }'`"
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
or32:Linux:*:*)