diff options
Diffstat (limited to 'config')
| -rwxr-xr-x | config/install-sh | 15 | ||||
| -rw-r--r-- | config/texinfo.tex | 12 |
2 files changed, 18 insertions, 9 deletions
diff --git a/config/install-sh b/config/install-sh index 2c1f8777b..f5061e7e2 100755 --- a/config/install-sh +++ b/config/install-sh @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2003-06-13.21 +scriptversion=2003-09-24.23 # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -151,6 +151,11 @@ if test -z "$src"; then exit 1 fi +# Protect names starting with `-'. +case $src in + -*) src=./$src ;; +esac + if test -n "$dir_arg"; then dst=$src src= @@ -175,6 +180,11 @@ else exit 1 fi + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then @@ -182,11 +192,10 @@ else fi fi -## this sed command emulates the dirname command +# This sed command emulates the dirname command. dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Make sure that the destination directory exists. -# (this part is taken from Noah Friedman's mkinstalldirs script.) # Skip lots of stat calls in the usual case. if test ! -d "$dstdir"; then diff --git a/config/texinfo.tex b/config/texinfo.tex index fca1ccb52..f0c0cf320 100644 --- a/config/texinfo.tex +++ b/config/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2003-09-24.10} +\def\texinfoversion{2003-09-25.11} % % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. @@ -5066,12 +5066,12 @@ width0pt\relax} \fi \begingroup\inENV % If there are two @def commands in a row, we'll have a \nobreak, % which is there to keep the function description together with its - % header. But if there's nothing but headers, we want to allow a - % break after all. Check for penalty 10002 (inserted by + % header. But if there's nothing but headers, we need to allow a + % break somewhere. Check for penalty 10002 (inserted by % \defargscommonending) instead of 10000, since the sectioning % commands insert a \penalty10000, and we don't want to allow a break % between a section heading and a defun. - \ifnum\lastpenalty=10002 \penalty0 \fi + \ifnum\lastpenalty=10002 \penalty2000 \fi % % Similarly, after a section heading, do not allow a break. % But do insert the glue. @@ -5093,7 +5093,7 @@ width0pt\relax} \fi \def\defxbodycommon{% % As with \parsebodycommon above, allow line break if we have multiple % x headers in a row. It's not a great place, though. - \ifnum\lastpenalty=10000 \penalty1000 \fi + \ifnum\lastpenalty=10002 \penalty2000 \fi % \begingroup\obeylines } @@ -5241,7 +5241,7 @@ width0pt\relax} \fi \advance\rightskip by 0pt plus 1fil \endgraf \nobreak\vskip -\parskip - \penalty 10002 % signal to \parsebodycommon. + \penalty 10002 % signal to \parsebodycommon and \defxbodycommon. } % This expands the args and terminates the paragraph they comprise. |