Import newer scripts upstream

This commit is contained in:
Pierre Pronchery 2020-11-03 07:01:09 +01:00
parent ac95d85dc1
commit b69cefd62d

View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
#$Id$ #$Id$
#Copyright (c) 2012-2016 Pierre Pronchery <khorben@defora.org> #Copyright (c) 2012-2019 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:
@ -36,7 +36,6 @@ LIBEXECDIR=
MANDIR= MANDIR=
PROGNAME="subst.sh" PROGNAME="subst.sh"
SYSCONFDIR= SYSCONFDIR=
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
#executables #executables
CHMOD="chmod" CHMOD="chmod"
DATE="date" DATE="date"
@ -46,6 +45,7 @@ INSTALL="install"
MKDIR="mkdir -m 0755 -p" MKDIR="mkdir -m 0755 -p"
RM="rm -f" RM="rm -f"
SED="sed" SED="sed"
[ -f "$CONFIGSH" ] && . "$CONFIGSH"
#functions #functions
@ -70,7 +70,7 @@ _subst()
LDSO="/libexec/ld-elf.so.1" LDSO="/libexec/ld-elf.so.1"
;; ;;
Linux) Linux)
LDSO="/lib/ld-linux-$(uname -p).so.2" LDSO="/lib/ld-linux-$(uname -m | tr _ -).so.2"
;; ;;
*) *)
LDSO="/libexec/ld.elf_so" LDSO="/libexec/ld.elf_so"
@ -112,6 +112,8 @@ _subst()
#create #create
source="${target#$OBJDIR}" source="${target#$OBJDIR}"
source="${source}.in" source="${source}.in"
([ -z "$OBJDIR" ] || $DEBUG $MKDIR -- "${target%/*}") \
|| return 2
$DEBUG $SED -e "s;@PACKAGE@;$PACKAGE;g" \ $DEBUG $SED -e "s;@PACKAGE@;$PACKAGE;g" \
-e "s;@VERSION@;$VERSION;g" \ -e "s;@VERSION@;$VERSION;g" \
-e "s;@PREFIX@;$PREFIX;g" \ -e "s;@PREFIX@;$PREFIX;g" \
@ -123,8 +125,8 @@ _subst()
-e "s;@LIBDIR@;$LIBDIR;g" \ -e "s;@LIBDIR@;$LIBDIR;g" \
-e "s;@LIBEXECDIR@;$LIBEXECDIR;g" \ -e "s;@LIBEXECDIR@;$LIBEXECDIR;g" \
-e "s;@MANDIR@;$MANDIR;g" \ -e "s;@MANDIR@;$MANDIR;g" \
-e "s;@SYSCONFDIR@;$SYSCONFDIR;g" \
-e "s;@PWD@;$PWD;g" \ -e "s;@PWD@;$PWD;g" \
-e "s;@SYSCONFDIR@;$SYSCONFDIR;g" \
-- "$source" > "$target" -- "$source" > "$target"
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
$RM -- "$target" 2> "$DEVNULL" $RM -- "$target" 2> "$DEVNULL"
@ -190,7 +192,7 @@ while getopts "ciuO:P:" name; do
esac esac
done done
shift $(($OPTIND - 1)) shift $(($OPTIND - 1))
if [ $# -eq 0 ]; then if [ $# -lt 1 ]; then
_usage _usage
exit $? exit $?
fi fi