Changeset 500 in MondoRescue for branches/stable/mondo


Ignore:
Timestamp:
Apr 29, 2006, 1:50:55 AM (18 years ago)
Author:
bcornec
Message:

Internationalization follow up

Location:
branches/stable/mondo
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • branches/stable/mondo/Makefile.am

    r423 r500  
    11AUTOMAKE_OPTIONS = 1.7
    2 SUBDIRS        = mondo
     2SUBDIRS        = mondo po
    33man8_MANS      = docs/man/mondoarchive.8 docs/man/mondorestore.8
     4
     5ACLOCAL_AMFLAGS = -I m4
     6
     7EXTRA_DIST = config.rpath  config.rpath

  • branches/stable/mondo/bootstrap

    r499 r500  
    2828make maintainer-clean >/dev/null 2>&1
    2929libtoolize -f -c --automake
     30gettextize -c -f --no-changelog < /dev/null
    3031aclocal -I m4
    31 automake m4/Makefile
    32 gettextize -c --no-changelog
    3332autoheader
    3433automake

  • branches/stable/mondo/config.guess

    r498 r500  
    22# Attempt to guess a canonical system name.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
    5 #   Inc.
    6 
    7 timestamp='2006-04-26'
     4#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
     5
     6timestamp='2005-05-15'
    87
    98# This file is free software; you can redistribute it and/or modify it
    … …  
    108107trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
    109108: ${TMPDIR=/tmp} ;
    110  { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
     109 { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
    111110 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
    112111 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
    … …  
    127126 ,,*)   CC_FOR_BUILD=$CC ;;
    128127 ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
    129 esac ; set_cc_for_build= ;'
     128esac ;'
    130129
    131130# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
    … …  
    201200    echo "${machine}-${os}${release}"
    202201    exit ;;
     202    amd64:OpenBSD:*:*)
     203    echo x86_64-unknown-openbsd${UNAME_RELEASE}
     204    exit ;;
     205    amiga:OpenBSD:*:*)
     206    echo m68k-unknown-openbsd${UNAME_RELEASE}
     207    exit ;;
     208    cats:OpenBSD:*:*)
     209    echo arm-unknown-openbsd${UNAME_RELEASE}
     210    exit ;;
     211    hp300:OpenBSD:*:*)
     212    echo m68k-unknown-openbsd${UNAME_RELEASE}
     213    exit ;;
     214    luna88k:OpenBSD:*:*)
     215        echo m88k-unknown-openbsd${UNAME_RELEASE}
     216    exit ;;
     217    mac68k:OpenBSD:*:*)
     218    echo m68k-unknown-openbsd${UNAME_RELEASE}
     219    exit ;;
     220    macppc:OpenBSD:*:*)
     221    echo powerpc-unknown-openbsd${UNAME_RELEASE}
     222    exit ;;
     223    mvme68k:OpenBSD:*:*)
     224    echo m68k-unknown-openbsd${UNAME_RELEASE}
     225    exit ;;
     226    mvme88k:OpenBSD:*:*)
     227    echo m88k-unknown-openbsd${UNAME_RELEASE}
     228    exit ;;
     229    mvmeppc:OpenBSD:*:*)
     230    echo powerpc-unknown-openbsd${UNAME_RELEASE}
     231    exit ;;
     232    sgi:OpenBSD:*:*)
     233    echo mips64-unknown-openbsd${UNAME_RELEASE}
     234    exit ;;
     235    sun3:OpenBSD:*:*)
     236    echo m68k-unknown-openbsd${UNAME_RELEASE}
     237    exit ;;
    203238    *:OpenBSD:*:*)
    204     UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
    205     echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
     239    echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
    206240    exit ;;
    207241    *:ekkoBSD:*:*)
    208242    echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
    209     exit ;;
    210     *:SolidBSD:*:*)
    211     echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
    212243    exit ;;
    213244    macppc:MirBSD:*:*)
    … …  
    628659    if [ ${HP_ARCH} = "hppa2.0w" ]
    629660    then
    630         eval $set_cc_for_build
     661        # avoid double evaluation of $set_cc_for_build
     662        test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
    631663
    632664        # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
    … …  
    769801    exit ;;
    770802    *:FreeBSD:*:*)
    771     case ${UNAME_MACHINE} in
    772         pc98)
    773         echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
    774         amd64)
    775         echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
    776         *)
    777         echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
    778     esac
     803    echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
    779804    exit ;;
    780805    i*:CYGWIN*:*)
    781806    echo ${UNAME_MACHINE}-pc-cygwin
    782807    exit ;;
    783     i*:MINGW*:*)
     808    i*:MINGW*:* | i*:windows32*:*)
    784809    echo ${UNAME_MACHINE}-pc-mingw32
    785     exit ;;
    786     i*:windows32*:*)
    787         # uname -m includes "-pc" on this system.
    788         echo ${UNAME_MACHINE}-mingw32
    789810    exit ;;
    790811    i*:PW*:*)
    791812    echo ${UNAME_MACHINE}-pc-pw32
    792813    exit ;;
    793     x86:Interix*:[345]*)
    794     echo i586-pc-interix${UNAME_RELEASE}
    795     exit ;;
    796     EM64T:Interix*:[345]*)
    797     echo x86_64-unknown-interix${UNAME_RELEASE}
     814    x86:Interix*:[34]*)
     815    echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
    798816    exit ;;
    799817    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
    … …  
    809827    echo ${UNAME_MACHINE}-pc-uwin
    810828    exit ;;
    811     amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
     829    amd64:CYGWIN*:*:*)
    812830    echo x86_64-unknown-cygwin
    813831    exit ;;
    … …  
    866884    #endif
    867885EOF
    868     eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
    869         /^CPU/{
    870         s: ::g
    871         p
    872         }'`"
     886    eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
    873887    test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
    874888    ;;
    … …  
    889903    #endif
    890904EOF
    891     eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
    892         /^CPU/{
    893         s: ::g
    894         p
    895         }'`"
     905    eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
    896906    test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
    897907    ;;
    898     or32:Linux:*:*)
    899     echo or32-unknown-linux-gnu
    900     exit ;;
    901908    ppc:Linux:*:*)
    902909    echo powerpc-unknown-linux-gnu
    … …  
    941948    sparc:Linux:*:* | sparc64:Linux:*:*)
    942949    echo ${UNAME_MACHINE}-unknown-linux-gnu
    943     exit ;;
    944     vax:Linux:*:*)
    945     echo ${UNAME_MACHINE}-dec-linux-gnu
    946950    exit ;;
    947951    x86_64:Linux:*:*)
    … …  
    990994    # endif
    991995    #else
    992     #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
     996    #ifdef __INTEL_COMPILER
    993997    LIBC=gnu
    994998    #else
    … …  
    10001004    #endif
    10011005EOF
    1002     eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
    1003         /^LIBC/{
    1004         s: ::g
    1005         p
    1006         }'`"
     1006    eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
    10071007    test x"${LIBC}" != x && {
    10081008        echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
    … …  
    12151215    UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
    12161216    case $UNAME_PROCESSOR in
     1217        *86) UNAME_PROCESSOR=i686 ;;
    12171218        unknown) UNAME_PROCESSOR=powerpc ;;
    12181219    esac
    … …  
    12921293    i*86:skyos:*:*)
    12931294    echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
    1294     exit ;;
    1295     i*86:rdos:*:*)
    1296     echo ${UNAME_MACHINE}-pc-rdos
    12971295    exit ;;
    12981296esac

  • branches/stable/mondo/config.sub

    r498 r500  
    22# Configuration validation subroutine script.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
    5 #   Inc.
    6 
    7 timestamp='2006-03-07'
     4#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
     5
     6timestamp='2005-05-12'
    87
    98# This file is (in principle) common to ALL GNU software.
    … …  
    121120maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
    122121case $maybe_os in
    123   nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
    124   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
    125   storm-chaos* | os2-emx* | rtmk-nova*)
     122  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
     123  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
    126124    os=-$maybe_os
    127125    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
    … …  
    174172        os=-hiuxwe2
    175173        ;;
    176     -sco6)
    177         os=-sco5v6
    178         basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    179         ;;
    180174    -sco5)
    181175        os=-sco3.2v5
    … …  
    191185        ;;
    192186    -sco3.2v[4-9]*)
    193         # Don't forget version if it is 3.2v4 or newer.
    194         basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    195         ;;
    196     -sco5v6*)
    197187        # Don't forget version if it is 3.2v4 or newer.
    198188        basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
    … …  
    250240    | i370 | i860 | i960 | ia64 \
    251241    | ip2k | iq2000 \
    252     | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
     242    | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
    253243    | mips | mipsbe | mipseb | mipsel | mipsle \
    254244    | mips16 \
    … …  
    259249    | mips64vr4300 | mips64vr4300el \
    260250    | mips64vr5000 | mips64vr5000el \
    261     | mips64vr5900 | mips64vr5900el \
    262251    | mipsisa32 | mipsisa32el \
    263252    | mipsisa32r2 | mipsisa32r2el \
    … …  
    268257    | mipstx39 | mipstx39el \
    269258    | mn10200 | mn10300 \
    270     | mt \
    271259    | msp430 \
    272     | nios | nios2 \
    273260    | ns16k | ns32k \
    274     | or32 \
     261    | openrisc | or32 \
    275262    | pdp10 | pdp11 | pj | pjl \
    276263    | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
    277264    | pyramid \
    278     | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
     265    | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
    279266    | sh64 | sh64le \
    280     | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
    281     | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
     267    | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
     268    | sparcv8 | sparcv9 | sparcv9b \
    282269    | strongarm \
    283270    | tahoe | thumb | tic4x | tic80 | tron \
    … …  
    288275        basic_machine=$basic_machine-unknown
    289276        ;;
    290     m32c)
    291         basic_machine=$basic_machine-unknown
    292         ;;
    293277    m6811 | m68hc11 | m6812 | m68hc12)
    294278        # Motorola 68HC11/12.
    … …  
    297281        ;;
    298282    m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
    299         ;;
    300     ms1)
    301         basic_machine=mt-unknown
    302283        ;;
    303284
    … …  
    342323    | mips64vr4300-* | mips64vr4300el-* \
    343324    | mips64vr5000-* | mips64vr5000el-* \
    344     | mips64vr5900-* | mips64vr5900el-* \
    345325    | mipsisa32-* | mipsisa32el-* \
    346326    | mipsisa32r2-* | mipsisa32r2el-* \
    … …  
    351331    | mipstx39-* | mipstx39el-* \
    352332    | mmix-* \
    353     | mt-* \
    354333    | msp430-* \
    355     | nios-* | nios2-* \
    356334    | none-* | np1-* | ns16k-* | ns32k-* \
    357335    | orion-* \
    … …  
    360338    | pyramid-* \
    361339    | romp-* | rs6000-* \
    362     | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
     340    | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
    363341    | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
    364     | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
     342    | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
    365343    | sparclite-* \
    366     | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
     344    | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
    367345    | tahoe-* | thumb-* \
    368346    | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
    … …  
    375353    | z8k-*)
    376354        ;;
    377     m32c-*)
    378         ;;
    379355    # Recognize the various machine names and aliases which stand
    380356    # for a CPU type and a company and sometimes even an OS.
    … …  
    711687        basic_machine=i386-pc
    712688        os=-msdos
    713         ;;
    714     ms1-*)
    715         basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
    716689        ;;
    717690    mvs)
    … …  
    790763        os=-proelf
    791764        ;;
    792     openrisc | openrisc-*)
     765    or32 | or32-*)
    793766        basic_machine=or32-unknown
     767        os=-coff
    794768        ;;
    795769    os400)
    … …  
    822796        basic_machine=ns32k-pc532
    823797        ;;
    824     pc98)
    825         basic_machine=i386-pc
    826         ;;
    827     pc98-*)
    828         basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
    829         ;;
    830798    pentium | p5 | k5 | k6 | nexgen | viac3)
    831799        basic_machine=i586-pc
    … …  
    883851        basic_machine=i586-unknown
    884852        os=-pw32
    885         ;;
    886     rdos)
    887         basic_machine=i386-pc
    888         os=-rdos
    889853        ;;
    890854    rom68k)
    … …  
    11271091        basic_machine=we32k-att
    11281092        ;;
    1129     sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
     1093    sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
    11301094        basic_machine=sh-unknown
    11311095        ;;
    1132     sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
     1096    sh64)
     1097        basic_machine=sh64-unknown
     1098        ;;
     1099    sparc | sparcv8 | sparcv9 | sparcv9b)
    11331100        basic_machine=sparc-sun
    11341101        ;;
    … …  
    12031170          | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
    12041171          | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
    1205           | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
    1206           | -openbsd* | -solidbsd* \
     1172          | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
    12071173          | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
    12081174          | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
    … …  
    12111177          | -chorusos* | -chorusrdb* \
    12121178          | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
    1213           | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
    1214           | -uxpv* | -beos* | -mpeix* | -udk* \
     1179          | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
    12151180          | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
    12161181          | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
    … …  
    12181183          | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
    12191184          | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
    1220           | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
    1221           | -skyos* | -haiku* | -rdos*)
     1185          | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* | -skyos*)
    12221186    # Remember, each alternative MUST END IN *, to match a version number.
    12231187        ;;
    … …  
    12371201        ;;
    12381202    -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
    1239           | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
     1203          | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
    12401204          | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
    12411205        ;;
    … …  
    14251389    *-be)
    14261390        os=-beos
    1427         ;;
    1428     *-haiku)
    1429         os=-haiku
    14301391        ;;
    14311392    *-ibm)

  • branches/stable/mondo/configure.in

    r497 r500  
    123123AC_CHECK_FUNCS([bzero getcwd memmove memset mkdir mkfifo setenv strcasecmp strchr strerror strrchr strstr])
    124124
    125 AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile m4/Makefile.in po/Makefile])
     125AC_OUTPUT([Makefile mondo/Makefile mondo/common/Makefile mondo/mondoarchive/Makefile mondo/mondorestore/Makefile mondo/restore-scripts/Makefile mondo/restore-scripts/mondo/Makefile mondo/restore-scripts/usr/Makefile mondo/restore-scripts/usr/bin/Makefile mondo/post-nuke.sample/Makefile mondo/post-nuke.sample/usr/Makefile mondo/post-nuke.sample/usr/bin/Makefile m4/Makefile po/Makefile.in])

  • branches/stable/mondo/mkinstalldirs

    r30 r500  
    11#! /bin/sh
    22# mkinstalldirs --- make directory hierarchy
    3 # Author: Noah Friedman <friedman@prep.ai.mit.edu>
     3
     4scriptversion=2004-02-15.20
     5
     6# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
    47# Created: 1993-05-16
    5 # Public domain
     8# Public domain.
     9#
     10# This file is maintained in Automake, please report
     11# bugs to <bug-automake@gnu.org> or send patches to
     12# <automake-patches@gnu.org>.
    613
    714errstatus=0
    … …  
    916
    1017usage="\
    11 Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
     18Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
     19
     20Create each directory DIR (with mode MODE, if specified), including all
     21leading file name components.
     22
     23Report bugs to <bug-automake@gnu.org>."
    1224
    1325# process command line arguments
    1426while test $# -gt 0 ; do
    15    case "${1}" in
    16      -h | --help | --h* )           # -h for help
    17     echo "${usage}" 1>&2; exit 0 ;;
    18      -m )                   # -m PERM arg
    19     shift
    20     test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
    21     dirmode="${1}"
    22     shift ;;
    23      -- ) shift; break ;;           # stop option processing
    24      -* ) echo "${usage}" 1>&2; exit 1 ;;   # unknown option
    25      * )  break ;;              # first non-opt arg
    26    esac
     27  case $1 in
     28    -h | --help | --h*)         # -h for help
     29      echo "$usage"
     30      exit 0
     31      ;;
     32    -m)                         # -m PERM arg
     33      shift
     34      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
     35      dirmode=$1
     36      shift
     37      ;;
     38    --version)
     39      echo "$0 $scriptversion"
     40      exit 0
     41      ;;
     42    --)                         # stop option processing
     43      shift
     44      break
     45      ;;
     46    -*)                         # unknown option
     47      echo "$usage" 1>&2
     48      exit 1
     49      ;;
     50    *)                          # first non-opt arg
     51      break
     52      ;;
     53  esac
    2754done
    2855
    … …  
    3764
    3865case $# in
    39 0) exit 0 ;;
     66  0) exit 0 ;;
    4067esac
    4168
     69# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
     70# mkdir -p a/c at the same time, both will detect that a is missing,
     71# one will create a, then the other will try to create a and die with
     72# a "File exists" error.  This is a problem when calling mkinstalldirs
     73# from a parallel make.  We use --version in the probe to restrict
     74# ourselves to GNU mkdir, which is thread-safe.
    4275case $dirmode in
    43 '')
    44   if mkdir -p -- . 2>/dev/null; then
    45     echo "mkdir -p -- $*"
    46     exec mkdir -p -- "$@"
    47   fi ;;
    48 *)
    49   if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
    50     echo "mkdir -m $dirmode -p -- $*"
    51     exec mkdir -m "$dirmode" -p -- "$@"
    52   fi ;;
     76  '')
     77    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
     78      echo "mkdir -p -- $*"
     79      exec mkdir -p -- "$@"
     80    else
     81      # On NextStep and OpenStep, the `mkdir' command does not
     82      # recognize any option.  It will interpret all options as
     83      # directories to create, and then abort because `.' already
     84      # exists.
     85      test -d ./-p && rmdir ./-p
     86      test -d ./--version && rmdir ./--version
     87    fi
     88    ;;
     89  *)
     90    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
     91       test ! -d ./--version; then
     92      echo "mkdir -m $dirmode -p -- $*"
     93      exec mkdir -m "$dirmode" -p -- "$@"
     94    else
     95      # Clean up after NextStep and OpenStep mkdir.
     96      for d in ./-m ./-p ./--version "./$dirmode";
     97      do
     98        test -d $d && rmdir $d
     99      done
     100    fi
     101    ;;
    53102esac
    54103
    55104for file
    56105do
    57    set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
    58    shift
     106  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
     107  shift
    59108
    60    pathcomp=
    61    for d
    62    do
    63      pathcomp="$pathcomp$d"
    64      case "$pathcomp" in
    65        -* ) pathcomp=./$pathcomp ;;
    66      esac
     109  pathcomp=
     110  for d
     111  do
     112    pathcomp="$pathcomp$d"
     113    case $pathcomp in
     114      -*) pathcomp=./$pathcomp ;;
     115    esac
    67116
    68      if test ! -d "$pathcomp"; then
    69     echo "mkdir $pathcomp"
     117    if test ! -d "$pathcomp"; then
     118      echo "mkdir $pathcomp"
    70119
    71     mkdir "$pathcomp" || lasterr=$?
     120      mkdir "$pathcomp" || lasterr=$?
    72121
    73     if test ! -d "$pathcomp"; then
    74       errstatus=$lasterr
    75     else
    76       if test ! -z "$dirmode"; then
    77          echo "chmod $dirmode $pathcomp"
     122      if test ! -d "$pathcomp"; then
     123    errstatus=$lasterr
     124      else
     125    if test ! -z "$dirmode"; then
     126      echo "chmod $dirmode $pathcomp"
     127      lasterr=""
     128      chmod "$dirmode" "$pathcomp" || lasterr=$?
    78129
    79          lasterr=""
    80          chmod "$dirmode" "$pathcomp" || lasterr=$?
    81 
    82          if test ! -z "$lasterr"; then
    83            errstatus=$lasterr
    84          fi
     130      if test ! -z "$lasterr"; then
     131        errstatus=$lasterr
    85132      fi
    86133    fi
    87      fi
     134      fi
     135    fi
    88136
    89      pathcomp="$pathcomp/"
    90    done
     137    pathcomp="$pathcomp/"
     138  done
    91139done
    92140
    … …  
    95143# Local Variables:
    96144# mode: shell-script
    97 # sh-indentation: 3
     145# sh-indentation: 2
     146# eval: (add-hook 'write-file-hooks 'time-stamp)
     147# time-stamp-start: "scriptversion="
     148# time-stamp-format: "%:y-%02m-%02d.%02H"
     149# time-stamp-end: "$"
    98150# End:
    99 # mkinstalldirs ends here
Note: See TracChangeset for help on using the changeset viewer.