diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rwxr-xr-x | scripts/makeworld.in (renamed from scripts/makeworld) | 23 |
3 files changed, 22 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 6c1bfd35..b3bc443e 100644 --- a/configure.ac +++ b/configure.ac @@ -220,6 +220,7 @@ scripts/Makefile scripts/abs scripts/gensync scripts/makepkg +scripts/makeworld doc/Makefile etc/Makefile etc/makepkg.conf diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 0c6a06fb..9d67270a 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -16,7 +16,7 @@ bin_SCRIPTS = \ EXTRA_DIST = abs.in \ gensync.in \ makepkg.in \ - makeworld \ + makeworld.in \ pacman-optimize \ rankmirrors \ repo-add \ diff --git a/scripts/makeworld b/scripts/makeworld.in index b9d318c6..acbd2830 100755 --- a/scripts/makeworld +++ b/scripts/makeworld.in @@ -2,7 +2,7 @@ # # makeworld # -# Copyright (c) 2002-2006 by Judd Vinet <jvinet@zeroflux.org> +# Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,7 +20,7 @@ # USA. # -version="3.0.0" +version="@PACKAGE_VERSION@" toplevel=$(pwd) usage() { @@ -53,6 +53,15 @@ usage() { echo "This should be run from the toplevel directory of ABS (usually /var/abs)" } +version() { + printf "makeworld (pacman) %s\n" "$version" + printf "Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\n" + echo + printf "This is free software; see the source for copying conditions.\n" + printf "There is NO WARRANTY, to the extent permitted by the law.\n" + echo +} + if [ $# -lt 2 ]; then usage exit 1 @@ -82,12 +91,16 @@ for arg in $*; do usage exit 0 ;; + --version) + version + exit 0 + ;; --*) usage exit 1 ;; -*) - while getopts "chisSbdfrBCemoS-" opt; do + while getopts "chisSbdfrBCemoSV-" opt; do case $opt in c) MAKEPKG_OPTS="$MAKEPKG_OPTS -c" ;; i) MAKEPKG_OPTS="$MAKEPKG_OPTS -i" ;; @@ -106,6 +119,10 @@ for arg in $*; do usage exit 0 ;; + V) + version + exit 0 + ;; -) OPTIND=0 break |