diff options
Diffstat (limited to 'bootstrap')
-rwxr-xr-x | bootstrap | 44 |
1 files changed, 5 insertions, 39 deletions
@@ -4,18 +4,6 @@ usage() { echo >&2 "\ Usage: $0 [OPTION]... Bootstrap this package from the checked-out sources. - -Options: - --gnulib-srcdir=DIRNAME Specify the local directory where gnulib - sources reside. Use this if you already - have gnulib sources on your machine, and - do not want to waste your bandwidth downloading - them again. - -If the file bootstrap.conf exists in the current working directory, its -contents are read as shell variables to configure the bootstrap. - -Running without arguments will suffice in most cases. " } @@ -25,8 +13,6 @@ do --help) usage exit;; - --gnulib-srcdir=*) - GNULIB_SRCDIR=`expr "$option" : '--gnulib-srcdir=\(.*\)'`;; *) echo >&2 "$0: $option: unknown option" exit 1;; @@ -35,30 +21,10 @@ done # Get gnulib files. -case ${GNULIB_SRCDIR--} in --) - echo "$0: getting gnulib files..." - git submodule init || exit $? - git submodule update || exit $? - GNULIB_SRCDIR=.gnulib - ;; -*) - # Redirect the gnulib submodule to the directory on the command line - # if possible. - if test -d "$GNULIB_SRCDIR"/.git && \ - git config --file .gitmodules submodule.gnulib.url >/dev/null; then - git submodule init - GNULIB_SRCDIR=`cd $GNULIB_SRCDIR && pwd` - git config --replace-all submodule.gnulib.url $GNULIB_SRCDIR - echo "$0: getting gnulib files..." - git submodule update || exit $? - GNULIB_SRCDIR=.gnulib - else - echo >&2 "$0: invalid gnulib srcdir: $GNULIB_SRCDIR" - exit 1 - fi - ;; -esac +echo "$0: getting gnulib files..." +git submodule init || exit $? +git submodule update || exit $? +GNULIB_SRCDIR=.gnulib ls po/*.po 2>/dev/null | sed 's|.*/||; s|\.po$||' > po/LINGUAS @@ -78,7 +44,7 @@ sed ' gnulib_tool=$GNULIB_SRCDIR/gnulib-tool <$gnulib_tool || exit -(cd daemon && mkdir -p tests lib && $GNULIB_SRCDIR/../gnulib-tool --update) +(cd daemon && mkdir -p tests lib && ../$gnulib_tool --update) modules=' gitlog-to-changelog |