Merge branch 'maint'

Remove gettext() function addition from gensync and updatesync in master as
gettext is no longer used in them anyway.

1 files changed, 11 insertions, 2 deletions

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 090ba5df..598e6879 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -939,8 +939,8 @@ create_xdelta() {
 create_srcpackage() {
 	cd "$startdir"
 	msg "$(gettext "Creating source package...")"
-	local comp_files="PKGBUILD"
-	msg2 "$(gettext "Adding %s...")" "PKGBUILD"
+	local comp_files="$BUILDSCRIPT"
+	msg2 "$(gettext "Adding %s...")" "$BUILDSCRIPT"
 
 	if [ "$install" != "" ]; then
 		if [ -f $install ]; then
@@ -1107,6 +1107,15 @@ This is free software; see the source for copying conditions.\n\
 There is NO WARRANTY, to the extent permitted by law.\n")"
 }
 
+# PROGRAM START
+
+# determine whether we have gettext; make it a no-op if we do not
+if [ ! $(type -t gettext) ]; then
+	gettext() {
+		echo "$@"
+	}
+fi
+
 ARGLIST=$@
 
 #preserve environment variables