From 75db24dd3658508af827454f63a34a1dc6041fde Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Wed, 26 Jun 2019 19:29:16 +0200
Subject: [PATCH] Import the latest version upstream

---
 tools/subst.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/subst.sh b/tools/subst.sh
index 7f60bf4..b35cccf 100755
--- a/tools/subst.sh
+++ b/tools/subst.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 #$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
 #modification, are permitted provided that the following conditions are met:
@@ -36,7 +36,6 @@ LIBEXECDIR=
 MANDIR=
 PROGNAME="subst.sh"
 SYSCONFDIR=
-[ -f "$CONFIGSH" ] && . "$CONFIGSH"
 #executables
 CHMOD="chmod"
 DATE="date"
@@ -46,6 +45,7 @@ INSTALL="install"
 MKDIR="mkdir -m 0755 -p"
 RM="rm -f"
 SED="sed"
+[ -f "$CONFIGSH" ] && . "$CONFIGSH"
 
 
 #functions
@@ -192,7 +192,7 @@ while getopts "ciuO:P:" name; do
 	esac
 done
 shift $(($OPTIND - 1))
-if [ $# -eq 0 ]; then
+if [ $# -lt 1 ]; then
 	_usage
 	exit $?
 fi