Reflect changes in scripts upstream

This commit is contained in:
Pierre Pronchery 2015-10-04 12:38:06 +02:00
parent c2f48b1246
commit b331bcc24e
2 changed files with 8 additions and 6 deletions

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2011-2014 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2011-2015 Pierre Pronchery <khorben@defora.org>
# #
#Redistribution and use in source and binary forms, with or without #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -29,6 +29,7 @@ PREFIX="/usr/local"
[ -f "../config.sh" ] && . "../config.sh" [ -f "../config.sh" ] && . "../config.sh"
DEBUG="_debug" DEBUG="_debug"
DEVNULL="/dev/null" DEVNULL="/dev/null"
PROGNAME="pkgconfig.sh"
#executables #executables
INSTALL="install -m 0644" INSTALL="install -m 0644"
MKDIR="mkdir -m 0755 -p" MKDIR="mkdir -m 0755 -p"
@ -48,7 +49,7 @@ _debug()
#error #error
_error() _error()
{ {
echo "pkgconfig.sh: $@" 1>&2 echo "$PROGNAME: $@" 1>&2
return 2 return 2
} }
@ -56,7 +57,7 @@ _error()
#usage #usage
_usage() _usage()
{ {
echo "Usage: pkgconfig.sh [-c|-i|-u][-P prefix] target..." 1>&2 echo "Usage: $PROGNAME [-c|-i|-u][-P prefix] target..." 1>&2
return 1 return 1
} }

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2010-2014 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2010-2015 Pierre Pronchery <khorben@defora.org>
# #
#Redistribution and use in source and binary forms, with or without #Redistribution and use in source and binary forms, with or without
#modification, are permitted provided that the following conditions are met: #modification, are permitted provided that the following conditions are met:
@ -29,6 +29,7 @@ PREFIX="/usr/local"
[ -f "../config.sh" ] && . "../config.sh" [ -f "../config.sh" ] && . "../config.sh"
LOCALEDIR="$PREFIX/share/locale" LOCALEDIR="$PREFIX/share/locale"
POTFILES="POTFILES" POTFILES="POTFILES"
PROGNAME="gettext.sh"
#executables #executables
DEBUG="_debug" DEBUG="_debug"
INSTALL="install -m 0644" INSTALL="install -m 0644"
@ -52,7 +53,7 @@ _debug()
#error #error
_error() _error()
{ {
echo "gettext.sh: $@" 1>&2 echo "$PROGNAME: $@" 1>&2
return 2 return 2
} }
@ -60,7 +61,7 @@ _error()
#usage #usage
_usage() _usage()
{ {
echo "Usage: gettext.sh [-c|-i|-u][-P prefix] target..." 1>&2 echo "Usage: $PROGNAME [-c|-i|-u][-P prefix] target..." 1>&2
return 1 return 1
} }