From 15c8546634076ea31ef65c257313fae79c5672b600a0f030c1d31ee8183303c4 Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Mon, 14 May 2018 12:02:13 +0000
Subject: [PATCH 1/4] Accepting request 606124 from home:Andreas_Schwab:Factory

- automake-SuSE.patch: fix variable syntax

OBS-URL: https://build.opensuse.org/request/show/606124
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=67
---
 automake-SuSE.patch        | 162 ++++++++++++++++++-------------------
 automake-testsuite.changes |   5 ++
 automake-testsuite.spec    |   2 +-
 automake.changes           |   5 ++
 automake.spec              |   2 +-
 5 files changed, 93 insertions(+), 83 deletions(-)

diff --git a/automake-SuSE.patch b/automake-SuSE.patch
index 7fdd5b9..941f8f8 100644
--- a/automake-SuSE.patch
+++ b/automake-SuSE.patch
@@ -29,10 +29,10 @@ Index: lib/config.guess
  		arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'`
  		endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'`
 -		machine="${arch}${endian}"-unknown
-+		machine="${arch}${endian}"-$(VENDOR)-unknown
++		machine="${arch}${endian}"-${VENDOR}-unknown
  		;;
 -	    *) machine="$UNAME_MACHINE_ARCH"-unknown ;;
-+	    *) machine="$UNAME_MACHINE_ARCH"-$(VENDOR)-unknown ;;
++	    *) machine="$UNAME_MACHINE_ARCH"-${VENDOR}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
  	# to ELF recently (or will in the future) and ABI.
@@ -41,45 +41,45 @@ Index: lib/config.guess
      *:Bitrig:*:*)
  	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
 -	echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE"
-+	echo "$UNAME_MACHINE_ARCH"-$(VENDOR)-bitrig"$UNAME_RELEASE"
++	echo "$UNAME_MACHINE_ARCH"-${VENDOR}-bitrig"$UNAME_RELEASE"
  	exit ;;
      *:OpenBSD:*:*)
  	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 -	echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE"
-+	echo "$UNAME_MACHINE_ARCH"-$(VENDOR)-openbsd"$UNAME_RELEASE"
++	echo "$UNAME_MACHINE_ARCH"-${VENDOR}-openbsd"$UNAME_RELEASE"
  	exit ;;
      *:LibertyBSD:*:*)
  	UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'`
 -	echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE"
-+	echo "$UNAME_MACHINE_ARCH"-$(VENDOR)-libertybsd"$UNAME_RELEASE"
++	echo "$UNAME_MACHINE_ARCH"-${VENDOR}-libertybsd"$UNAME_RELEASE"
  	exit ;;
      *:MidnightBSD:*:*)
 -	echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-midnightbsd"$UNAME_RELEASE"
++	echo "$UNAME_MACHINE"-${VENDOR}-midnightbsd"$UNAME_RELEASE"
  	exit ;;
      *:ekkoBSD:*:*)
 -	echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-ekkobsd"$UNAME_RELEASE"
++	echo "$UNAME_MACHINE"-${VENDOR}-ekkobsd"$UNAME_RELEASE"
  	exit ;;
      *:SolidBSD:*:*)
 -	echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-solidbsd"$UNAME_RELEASE"
++	echo "$UNAME_MACHINE"-${VENDOR}-solidbsd"$UNAME_RELEASE"
  	exit ;;
      macppc:MirBSD:*:*)
 -	echo powerpc-unknown-mirbsd"$UNAME_RELEASE"
-+	echo powerpc-$(VENDOR)-mirbsd"$UNAME_RELEASE"
++	echo powerpc-${VENDOR}-mirbsd"$UNAME_RELEASE"
  	exit ;;
      *:MirBSD:*:*)
 -	echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-mirbsd"$UNAME_RELEASE"
++	echo "$UNAME_MACHINE"-${VENDOR}-mirbsd"$UNAME_RELEASE"
  	exit ;;
      *:Sortix:*:*)
 -	echo "$UNAME_MACHINE"-unknown-sortix
-+	echo "$UNAME_MACHINE"-$(VENDOR)-sortix
++	echo "$UNAME_MACHINE"-${VENDOR}-sortix
  	exit ;;
      *:Redox:*:*)
 -	echo "$UNAME_MACHINE"-unknown-redox
-+	echo "$UNAME_MACHINE"-$(VENDOR)-redox
++	echo "$UNAME_MACHINE"-${VENDOR}-redox
  	exit ;;
      mips:OSF1:*.*)
          echo mips-dec-osf1
@@ -88,15 +88,15 @@ Index: lib/config.guess
  	exit $exitcode ;;
      Amiga*:UNIX_System_V:4.0:*)
 -	echo m68k-unknown-sysv4
-+	echo m68k-$(VENDOR)-sysv4
++	echo m68k-${VENDOR}-sysv4
  	exit ;;
      *:[Aa]miga[Oo][Ss]:*:*)
 -	echo "$UNAME_MACHINE"-unknown-amigaos
-+	echo "$UNAME_MACHINE"-$(VENDOR)-amigaos
++	echo "$UNAME_MACHINE"-${VENDOR}-amigaos
  	exit ;;
      *:[Mm]orph[Oo][Ss]:*:*)
 -	echo "$UNAME_MACHINE"-unknown-morphos
-+	echo "$UNAME_MACHINE"-$(VENDOR)-morphos
++	echo "$UNAME_MACHINE"-${VENDOR}-morphos
  	exit ;;
      *:OS/390:*:*)
  	echo i370-ibm-openedition
@@ -105,7 +105,7 @@ Index: lib/config.guess
  	exit ;;
      arm*:riscos:*:*|arm*:RISCOS:*:*)
 -	echo arm-unknown-riscos
-+	echo arm-$(VENDOR)-riscos
++	echo arm-${VENDOR}-riscos
  	exit ;;
      SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
  	echo hppa1.1-hitachi-hiuxmpp
@@ -114,7 +114,7 @@ Index: lib/config.guess
  	exit ;;
      *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
 -	echo m68k-unknown-mint"$UNAME_RELEASE"
-+	echo m68k-$(VENDOR)-mint"$UNAME_RELEASE"
++	echo m68k-${VENDOR}-mint"$UNAME_RELEASE"
  	exit ;;
      m68k:machten:*:*)
  	echo m68k-apple-machten"$UNAME_RELEASE"
@@ -123,10 +123,10 @@ Index: lib/config.guess
      i*86:OSF1:*:*)
  	if [ -x /usr/sbin/sysversion ] ; then
 -	    echo "$UNAME_MACHINE"-unknown-osf1mk
-+	    echo "$UNAME_MACHINE"-$(VENDOR)-osf1mk
++	    echo "$UNAME_MACHINE"-${VENDOR}-osf1mk
  	else
 -	    echo "$UNAME_MACHINE"-unknown-osf1
-+	    echo "$UNAME_MACHINE"-$(VENDOR)-osf1
++	    echo "$UNAME_MACHINE"-${VENDOR}-osf1
  	fi
  	exit ;;
      parisc*:Lites*:*:*)
@@ -135,11 +135,11 @@ Index: lib/config.guess
  	exit ;;
      sparc*:BSD/OS:*:*)
 -	echo sparc-unknown-bsdi"$UNAME_RELEASE"
-+	echo sparc-$(VENDOR)-bsdi"$UNAME_RELEASE"
++	echo sparc-${VENDOR}-bsdi"$UNAME_RELEASE"
  	exit ;;
      *:BSD/OS:*:*)
 -	echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-bsdi"$UNAME_RELEASE"
++	echo "$UNAME_MACHINE"-${VENDOR}-bsdi"$UNAME_RELEASE"
  	exit ;;
      *:FreeBSD:*:*)
  	UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -148,7 +148,7 @@ Index: lib/config.guess
  		UNAME_PROCESSOR=i586 ;;
  	esac
 -	echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
-+	echo "$UNAME_PROCESSOR"-$(VENDOR)-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
++	echo "$UNAME_PROCESSOR"-${VENDOR}-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
  	exit ;;
      i*:CYGWIN*:*)
  	echo "$UNAME_MACHINE"-pc-cygwin
@@ -157,11 +157,11 @@ Index: lib/config.guess
  		exit ;;
  	    authenticamd | genuineintel | EM64T)
 -		echo x86_64-unknown-interix"$UNAME_RELEASE"
-+		echo x86_64-$(VENDOR)-interix"$UNAME_RELEASE"
++		echo x86_64-${VENDOR}-interix"$UNAME_RELEASE"
  		exit ;;
  	    IA64)
 -		echo ia64-unknown-interix"$UNAME_RELEASE"
-+		echo ia64-$(VENDOR)-interix"$UNAME_RELEASE"
++		echo ia64-${VENDOR}-interix"$UNAME_RELEASE"
  		exit ;;
  	esac ;;
      i*:UWIN*:*)
@@ -169,33 +169,33 @@ Index: lib/config.guess
  	exit ;;
      amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
 -	echo x86_64-unknown-cygwin
-+	echo x86_64-$(VENDOR)-cygwin
++	echo x86_64-${VENDOR}-cygwin
  	exit ;;
      prep*:SunOS:5.*:*)
 -	echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
-+	echo powerpcle-$(VENDOR)-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
++	echo powerpcle-${VENDOR}-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`"
  	exit ;;
      *:GNU:*:*)
  	# the GNU system
 -	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
-+	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-$(VENDOR)-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
++	echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-${VENDOR}-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`"
  	exit ;;
      *:GNU/*:*:*)
  	# other systems with GNU libc and userland
 -	echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
-+	echo "$UNAME_MACHINE-$(VENDOR)-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
++	echo "$UNAME_MACHINE-${VENDOR}-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC"
  	exit ;;
      i*86:Minix:*:*)
  	echo "$UNAME_MACHINE"-pc-minix
  	exit ;;
      aarch64:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      aarch64_be:Linux:*:*)
  	UNAME_MACHINE=aarch64_be
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      alpha:Linux:*:*)
  	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -204,11 +204,11 @@ Index: lib/config.guess
  	objdump --private-headers /bin/sh | grep -q ld.so.1
  	if test "$?" = 0 ; then LIBC=gnulibc1 ; fi
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      arc:Linux:*:* | arceb:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      arm*:Linux:*:*)
  	eval "$set_cc_for_build"
@@ -216,22 +216,22 @@ Index: lib/config.guess
  	    | grep -q __ARM_EABI__
  	then
 -	    echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	    echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	    echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	else
  	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
  		| grep -q __ARM_PCS_VFP
  	    then
 -		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi
-+		echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"eabi
++		echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"eabi
  	    else
 -		echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf
-+		echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"eabihf
++		echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"eabihf
  	    fi
  	fi
  	exit ;;
      avr32*:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      cris:Linux:*:*)
  	echo "$UNAME_MACHINE"-axis-linux-"$LIBC"
@@ -240,34 +240,34 @@ Index: lib/config.guess
  	exit ;;
      e2k:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      frv:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      hexagon:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      i*86:Linux:*:*)
  	echo "$UNAME_MACHINE"-pc-linux-"$LIBC"
  	exit ;;
      ia64:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      k1om:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      m32r*:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      m68*:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      mips:Linux:*:* | mips64:Linux:*:*)
  	eval "$set_cc_for_build"
@@ -276,27 +276,27 @@ Index: lib/config.guess
  EOF
  	eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
 -	test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
-+	test "x$CPU" != x && { echo "$CPU-$(VENDOR)-linux-$LIBC"; exit; }
++	test "x$CPU" != x && { echo "$CPU-${VENDOR}-linux-$LIBC"; exit; }
  	;;
      mips64el:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      openrisc*:Linux:*:*)
 -	echo or1k-unknown-linux-"$LIBC"
-+	echo or1k-$(VENDOR)-linux-"$LIBC"
++	echo or1k-${VENDOR}-linux-"$LIBC"
  	exit ;;
      or32:Linux:*:* | or1k*:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      padre:Linux:*:*)
 -	echo sparc-unknown-linux-"$LIBC"
-+	echo sparc-$(VENDOR)-linux-"$LIBC"
++	echo sparc-${VENDOR}-linux-"$LIBC"
  	exit ;;
      parisc64:Linux:*:* | hppa64:Linux:*:*)
 -	echo hppa64-unknown-linux-"$LIBC"
-+	echo hppa64-$(VENDOR)-linux-"$LIBC"
++	echo hppa64-${VENDOR}-linux-"$LIBC"
  	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
@@ -304,49 +304,49 @@ Index: lib/config.guess
 -	  PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;;
 -	  PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;;
 -	  *)    echo hppa-unknown-linux-"$LIBC" ;;
-+	  PA7*) echo hppa1.1-$(VENDOR)-linux-"$LIBC" ;;
-+	  PA8*) echo hppa2.0-$(VENDOR)-linux-"$LIBC" ;;
-+	  *)    echo hppa-$(VENDOR)-linux-"$LIBC" ;;
++	  PA7*) echo hppa1.1-${VENDOR}-linux-"$LIBC" ;;
++	  PA8*) echo hppa2.0-${VENDOR}-linux-"$LIBC" ;;
++	  *)    echo hppa-${VENDOR}-linux-"$LIBC" ;;
  	esac
  	exit ;;
      ppc64:Linux:*:*)
 -	echo powerpc64-unknown-linux-"$LIBC"
-+	echo powerpc64-$(VENDOR)-linux-"$LIBC"
++	echo powerpc64-${VENDOR}-linux-"$LIBC"
  	exit ;;
      ppc:Linux:*:*)
 -	echo powerpc-unknown-linux-"$LIBC"
-+	echo powerpc-$(VENDOR)-linux-"$LIBC"
++	echo powerpc-${VENDOR}-linux-"$LIBC"
  	exit ;;
      ppc64le:Linux:*:*)
 -	echo powerpc64le-unknown-linux-"$LIBC"
-+	echo powerpc64le-$(VENDOR)-linux-"$LIBC"
++	echo powerpc64le-${VENDOR}-linux-"$LIBC"
  	exit ;;
      ppcle:Linux:*:*)
 -	echo powerpcle-unknown-linux-"$LIBC"
-+	echo powerpcle-$(VENDOR)-linux-"$LIBC"
++	echo powerpcle-${VENDOR}-linux-"$LIBC"
  	exit ;;
      riscv32:Linux:*:* | riscv64:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      s390:Linux:*:* | s390x:Linux:*:*)
  	echo "$UNAME_MACHINE"-ibm-linux-"$LIBC"
  	exit ;;
      sh64*:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      sh*:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      sparc:Linux:*:* | sparc64:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      tile*:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      vax:Linux:*:*)
  	echo "$UNAME_MACHINE"-dec-linux-"$LIBC"
@@ -355,7 +355,7 @@ Index: lib/config.guess
  	exit ;;
      xtensa*:Linux:*:*)
 -	echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-linux-"$LIBC"
++	echo "$UNAME_MACHINE"-${VENDOR}-linux-"$LIBC"
  	exit ;;
      i*86:DYNIX/ptx:4*:*)
  	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -364,18 +364,18 @@ Index: lib/config.guess
  	exit ;;
      i*86:XTS-300:*:STOP)
 -	echo "$UNAME_MACHINE"-unknown-stop
-+	echo "$UNAME_MACHINE"-$(VENDOR)-stop
++	echo "$UNAME_MACHINE"-${VENDOR}-stop
  	exit ;;
      i*86:atheos:*:*)
 -	echo "$UNAME_MACHINE"-unknown-atheos
-+	echo "$UNAME_MACHINE"-$(VENDOR)-atheos
++	echo "$UNAME_MACHINE"-${VENDOR}-atheos
  	exit ;;
      i*86:syllable:*:*)
  	echo "$UNAME_MACHINE"-pc-syllable
  	exit ;;
      i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
 -	echo i386-unknown-lynxos"$UNAME_RELEASE"
-+	echo i386-$(VENDOR)-lynxos"$UNAME_RELEASE"
++	echo i386-${VENDOR}-lynxos"$UNAME_RELEASE"
  	exit ;;
      i*86:*DOS:*:*)
  	echo "$UNAME_MACHINE"-pc-msdosdjgpp
@@ -384,7 +384,7 @@ Index: lib/config.guess
  	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
  	esac
 -	echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
-+	echo "$UNAME_MACHINE-$(VENDOR)-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
++	echo "$UNAME_MACHINE-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}"
  	exit ;;
      i*86:*:3.2:*)
  	if test -f /usr/options/cb.name; then
@@ -393,7 +393,7 @@ Index: lib/config.guess
  	  echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4
  	else # Add other i860-SVR4 vendors below as they are discovered.
 -	  echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
-+	  echo i860-$(VENDOR)-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
++	  echo i860-${VENDOR}-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4
  	fi
  	exit ;;
      mini*:CTIX:SYS*5:*)
@@ -402,22 +402,22 @@ Index: lib/config.guess
  	    && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;;
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
 -	echo m68k-unknown-lynxos"$UNAME_RELEASE"
-+	echo m68k-$(VENDOR)-lynxos"$UNAME_RELEASE"
++	echo m68k-${VENDOR}-lynxos"$UNAME_RELEASE"
  	exit ;;
      mc68030:UNIX_System_V:4.*:*)
  	echo m68k-atari-sysv4
  	exit ;;
      TSUNAMI:LynxOS:2.*:*)
 -	echo sparc-unknown-lynxos"$UNAME_RELEASE"
-+	echo sparc-$(VENDOR)-lynxos"$UNAME_RELEASE"
++	echo sparc-${VENDOR}-lynxos"$UNAME_RELEASE"
  	exit ;;
      rs6000:LynxOS:2.*:*)
 -	echo rs6000-unknown-lynxos"$UNAME_RELEASE"
-+	echo rs6000-$(VENDOR)-lynxos"$UNAME_RELEASE"
++	echo rs6000-${VENDOR}-lynxos"$UNAME_RELEASE"
  	exit ;;
      PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
 -	echo powerpc-unknown-lynxos"$UNAME_RELEASE"
-+	echo powerpc-$(VENDOR)-lynxos"$UNAME_RELEASE"
++	echo powerpc-${VENDOR}-lynxos"$UNAME_RELEASE"
  	exit ;;
      SM[BE]S:UNIX_SV:*:*)
  	echo mips-dde-sysv"$UNAME_RELEASE"
@@ -426,7 +426,7 @@ Index: lib/config.guess
  		echo mips-nec-sysv"$UNAME_RELEASE"
  	else
 -		echo mips-unknown-sysv"$UNAME_RELEASE"
-+		echo mips-$(VENDOR)-sysv"$UNAME_RELEASE"
++		echo mips-${VENDOR}-sysv"$UNAME_RELEASE"
  	fi
  	exit ;;
      BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
@@ -435,7 +435,7 @@ Index: lib/config.guess
  	exit ;;
      x86_64:Haiku:*:*)
 -	echo x86_64-unknown-haiku
-+	echo x86_64-$(VENDOR)-haiku
++	echo x86_64-${VENDOR}-haiku
  	exit ;;
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux"$UNAME_RELEASE"
@@ -444,15 +444,15 @@ Index: lib/config.guess
  	    UNAME_MACHINE="$cputype"
  	fi
 -	echo "$UNAME_MACHINE"-unknown-plan9
-+	echo "$UNAME_MACHINE"-$(VENDOR)-plan9
++	echo "$UNAME_MACHINE"-${VENDOR}-plan9
  	exit ;;
      *:TOPS-10:*:*)
 -	echo pdp10-unknown-tops10
-+	echo pdp10-$(VENDOR)-tops10
++	echo pdp10-${VENDOR}-tops10
  	exit ;;
      *:TENEX:*:*)
 -	echo pdp10-unknown-tenex
-+	echo pdp10-$(VENDOR)-tenex
++	echo pdp10-${VENDOR}-tenex
  	exit ;;
      KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
  	echo pdp10-dec-tops20
@@ -461,18 +461,18 @@ Index: lib/config.guess
  	exit ;;
      *:TOPS-20:*:*)
 -	echo pdp10-unknown-tops20
-+	echo pdp10-$(VENDOR)-tops20
++	echo pdp10-${VENDOR}-tops20
  	exit ;;
      *:ITS:*:*)
 -	echo pdp10-unknown-its
-+	echo pdp10-$(VENDOR)-its
++	echo pdp10-${VENDOR}-its
  	exit ;;
      SEI:*:*:SEIUX)
  	echo mips-sei-seiux"$UNAME_RELEASE"
  	exit ;;
      *:DragonFly:*:*)
 -	echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
-+	echo "$UNAME_MACHINE"-$(VENDOR)-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
++	echo "$UNAME_MACHINE"-${VENDOR}-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`"
  	exit ;;
      *:*VMS:*:*)
  	UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -481,11 +481,11 @@ Index: lib/config.guess
  	exit ;;
      x86_64:VMkernel:*:*)
 -	echo "$UNAME_MACHINE"-unknown-esx
-+	echo "$UNAME_MACHINE"-$(VENDOR)-esx
++	echo "$UNAME_MACHINE"-${VENDOR}-esx
  	exit ;;
      amd64:Isilon\ OneFS:*:*)
 -	echo x86_64-unknown-onefs
-+	echo x86_64-$(VENDOR)-onefs
++	echo x86_64-${VENDOR}-onefs
  	exit ;;
  esac
  
diff --git a/automake-testsuite.changes b/automake-testsuite.changes
index a31f4dd..75f3b3f 100644
--- a/automake-testsuite.changes
+++ b/automake-testsuite.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 10 09:34:46 UTC 2018 - schwab@suse.de
+
+- automake-SuSE.patch: fix variable syntax
+
 -------------------------------------------------------------------
 Wed Mar 21 11:26:53 CET 2018 - pth@suse.de
 
diff --git a/automake-testsuite.spec b/automake-testsuite.spec
index e83c192..180629e 100644
--- a/automake-testsuite.spec
+++ b/automake-testsuite.spec
@@ -24,9 +24,9 @@ Name:           automake-testsuite
 Version:        1.16.1
 Release:        0
 Summary:        A Program for Automatically Generating GNU-Style Makefile.in Files
-# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 License:        GPL-2.0-or-later AND GFDL-1.3-or-later AND SUSE-Public-Domain AND MIT
 Group:          Development/Tools/Building
+# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 Url:            https://www.gnu.org/software/automake
 Source0:        https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 Source1:        https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig
diff --git a/automake.changes b/automake.changes
index a31f4dd..75f3b3f 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu May 10 09:34:46 UTC 2018 - schwab@suse.de
+
+- automake-SuSE.patch: fix variable syntax
+
 -------------------------------------------------------------------
 Wed Mar 21 11:26:53 CET 2018 - pth@suse.de
 
diff --git a/automake.spec b/automake.spec
index c241b80..41893c8 100644
--- a/automake.spec
+++ b/automake.spec
@@ -24,9 +24,9 @@ Name:           automake
 Version:        1.16.1
 Release:        0
 Summary:        A Program for Automatically Generating GNU-Style Makefile.in Files
-# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 License:        GPL-2.0-or-later AND GFDL-1.3-or-later AND SUSE-Public-Domain AND MIT
 Group:          Development/Tools/Building
+# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 Url:            https://www.gnu.org/software/automake
 Source0:        https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 Source1:        https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig

From 8557250f0afd5f71b720177f031d4c646d8dd03cc71a4eaf917a7d3f42705ba7 Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Tue, 15 May 2018 14:54:01 +0000
Subject: [PATCH 2/4] - Add dejagnu, makeinfo, python3 and zip as BuildRequires
 for   automake-testsuite to make testsuite run succeed.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=68
---
 automake-testsuite.changes | 6 ++++++
 automake-testsuite.spec    | 6 +++++-
 automake.changes           | 6 ++++++
 automake.spec              | 6 +++++-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/automake-testsuite.changes b/automake-testsuite.changes
index 75f3b3f..7f4f77a 100644
--- a/automake-testsuite.changes
+++ b/automake-testsuite.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 15 16:47:10 CEST 2018 - pth@suse.de
+
+- Add dejagnu, makeinfo, python3 and zip as BuildRequires for
+  automake-testsuite to make testsuite run succeed.
+
 -------------------------------------------------------------------
 Thu May 10 09:34:46 UTC 2018 - schwab@suse.de
 
diff --git a/automake-testsuite.spec b/automake-testsuite.spec
index 180629e..c478bec 100644
--- a/automake-testsuite.spec
+++ b/automake-testsuite.spec
@@ -24,9 +24,9 @@ Name:           automake-testsuite
 Version:        1.16.1
 Release:        0
 Summary:        A Program for Automatically Generating GNU-Style Makefile.in Files
+# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 License:        GPL-2.0-or-later AND GFDL-1.3-or-later AND SUSE-Public-Domain AND MIT
 Group:          Development/Tools/Building
-# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 Url:            https://www.gnu.org/software/automake
 Source0:        https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 Source1:        https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig
@@ -51,9 +51,13 @@ Requires(post): info
 Requires(preun): info
 BuildArch:      noarch
 %if "%{name}" == "automake-testsuite"
+BuildRequires:  dejagnu
 BuildRequires:  expect
 BuildRequires:  flex
 BuildRequires:  libtool
+BuildRequires:  makeinfo
+BuildRequires:  python3
+BuildRequires:  zip
 Requires:       expect
 Requires:       flex
 Requires:       libtool
diff --git a/automake.changes b/automake.changes
index 75f3b3f..7f4f77a 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May 15 16:47:10 CEST 2018 - pth@suse.de
+
+- Add dejagnu, makeinfo, python3 and zip as BuildRequires for
+  automake-testsuite to make testsuite run succeed.
+
 -------------------------------------------------------------------
 Thu May 10 09:34:46 UTC 2018 - schwab@suse.de
 
diff --git a/automake.spec b/automake.spec
index 41893c8..bf958de 100644
--- a/automake.spec
+++ b/automake.spec
@@ -24,9 +24,9 @@ Name:           automake
 Version:        1.16.1
 Release:        0
 Summary:        A Program for Automatically Generating GNU-Style Makefile.in Files
+# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 License:        GPL-2.0-or-later AND GFDL-1.3-or-later AND SUSE-Public-Domain AND MIT
 Group:          Development/Tools/Building
-# docs ~> GFDL, sources ~> GPLv2+, mkinstalldirs ~> PD and install-sh ~> MIT
 Url:            https://www.gnu.org/software/automake
 Source0:        https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz
 Source1:        https://ftp.gnu.org/gnu/automake/automake-%{version}.tar.xz.sig
@@ -51,9 +51,13 @@ Requires(post): info
 Requires(preun): info
 BuildArch:      noarch
 %if "%{name}" == "automake-testsuite"
+BuildRequires:  dejagnu
 BuildRequires:  expect
 BuildRequires:  flex
 BuildRequires:  libtool
+BuildRequires:  makeinfo
+BuildRequires:  python3
+BuildRequires:  zip
 Requires:       expect
 Requires:       flex
 Requires:       libtool

From b5674efcf4e27a88d69047d661e3176f4aaa1e1add80de3785415ac472bbf79c Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Fri, 18 May 2018 09:45:01 +0000
Subject: [PATCH 3/4] - Add gettext-tools, pkg-config. vala dejagnu, makeinfo,
 python and zip as   BuildRequires for automake-testsuite to make testsuite
 complete and   enable more tests.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=69
---
 automake-testsuite.changes |  7 ++++---
 automake-testsuite.spec    | 11 ++++++++++-
 automake.changes           |  7 ++++---
 automake.spec              | 11 ++++++++++-
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/automake-testsuite.changes b/automake-testsuite.changes
index 7f4f77a..01d18de 100644
--- a/automake-testsuite.changes
+++ b/automake-testsuite.changes
@@ -1,8 +1,9 @@
 -------------------------------------------------------------------
-Tue May 15 16:47:10 CEST 2018 - pth@suse.de
+Fri May 18 11:41:32 CEST 2018 - pth@suse.de
 
-- Add dejagnu, makeinfo, python3 and zip as BuildRequires for
-  automake-testsuite to make testsuite run succeed.
+- Add gettext-tools, pkg-config. vala dejagnu, makeinfo, python and zip as
+  BuildRequires for automake-testsuite to make testsuite complete and
+  enable more tests.
 
 -------------------------------------------------------------------
 Thu May 10 09:34:46 UTC 2018 - schwab@suse.de
diff --git a/automake-testsuite.spec b/automake-testsuite.spec
index c478bec..43ab268 100644
--- a/automake-testsuite.spec
+++ b/automake-testsuite.spec
@@ -51,12 +51,21 @@ Requires(post): info
 Requires(preun): info
 BuildArch:      noarch
 %if "%{name}" == "automake-testsuite"
+BuildRequires:  compress
+BuildRequires:  cscope
 BuildRequires:  dejagnu
 BuildRequires:  expect
 BuildRequires:  flex
+BuildRequires:  gettext-tools
 BuildRequires:  libtool
+BuildRequires:  makedepend
 BuildRequires:  makeinfo
-BuildRequires:  python3
+BuildRequires:  pkg-config
+BuildRequires:  python
+BuildRequires:  sharutils
+%if 0%{suse_version} >= 1500
+BuildRequires:  vala
+%endif
 BuildRequires:  zip
 Requires:       expect
 Requires:       flex
diff --git a/automake.changes b/automake.changes
index 7f4f77a..01d18de 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,8 +1,9 @@
 -------------------------------------------------------------------
-Tue May 15 16:47:10 CEST 2018 - pth@suse.de
+Fri May 18 11:41:32 CEST 2018 - pth@suse.de
 
-- Add dejagnu, makeinfo, python3 and zip as BuildRequires for
-  automake-testsuite to make testsuite run succeed.
+- Add gettext-tools, pkg-config. vala dejagnu, makeinfo, python and zip as
+  BuildRequires for automake-testsuite to make testsuite complete and
+  enable more tests.
 
 -------------------------------------------------------------------
 Thu May 10 09:34:46 UTC 2018 - schwab@suse.de
diff --git a/automake.spec b/automake.spec
index bf958de..a93fcb1 100644
--- a/automake.spec
+++ b/automake.spec
@@ -51,12 +51,21 @@ Requires(post): info
 Requires(preun): info
 BuildArch:      noarch
 %if "%{name}" == "automake-testsuite"
+BuildRequires:  compress
+BuildRequires:  cscope
 BuildRequires:  dejagnu
 BuildRequires:  expect
 BuildRequires:  flex
+BuildRequires:  gettext-tools
 BuildRequires:  libtool
+BuildRequires:  makedepend
 BuildRequires:  makeinfo
-BuildRequires:  python3
+BuildRequires:  pkg-config
+BuildRequires:  python
+BuildRequires:  sharutils
+%if 0%{suse_version} >= 1500
+BuildRequires:  vala
+%endif
 BuildRequires:  zip
 Requires:       expect
 Requires:       flex

From 6bd5bb531fbc78d07544927d51e1d32da78ca3a198b17060b49ce51e1387e348 Mon Sep 17 00:00:00 2001
From: Philipp Thomas <pth@suse.com>
Date: Fri, 18 May 2018 10:56:22 +0000
Subject: [PATCH 4/4] - Remove non-existing compress from BuildRequires.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/automake?expand=0&rev=70
---
 automake-testsuite.changes | 5 +++++
 automake-testsuite.spec    | 1 -
 automake.changes           | 5 +++++
 automake.spec              | 1 -
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/automake-testsuite.changes b/automake-testsuite.changes
index 01d18de..9856322 100644
--- a/automake-testsuite.changes
+++ b/automake-testsuite.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 18 12:55:24 CEST 2018 - pth@suse.de
+
+- Remove non-existing compress from BuildRequires.
+
 -------------------------------------------------------------------
 Fri May 18 11:41:32 CEST 2018 - pth@suse.de
 
diff --git a/automake-testsuite.spec b/automake-testsuite.spec
index 43ab268..be0ac19 100644
--- a/automake-testsuite.spec
+++ b/automake-testsuite.spec
@@ -51,7 +51,6 @@ Requires(post): info
 Requires(preun): info
 BuildArch:      noarch
 %if "%{name}" == "automake-testsuite"
-BuildRequires:  compress
 BuildRequires:  cscope
 BuildRequires:  dejagnu
 BuildRequires:  expect
diff --git a/automake.changes b/automake.changes
index 01d18de..9856322 100644
--- a/automake.changes
+++ b/automake.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 18 12:55:24 CEST 2018 - pth@suse.de
+
+- Remove non-existing compress from BuildRequires.
+
 -------------------------------------------------------------------
 Fri May 18 11:41:32 CEST 2018 - pth@suse.de
 
diff --git a/automake.spec b/automake.spec
index a93fcb1..266d82f 100644
--- a/automake.spec
+++ b/automake.spec
@@ -51,7 +51,6 @@ Requires(post): info
 Requires(preun): info
 BuildArch:      noarch
 %if "%{name}" == "automake-testsuite"
-BuildRequires:  compress
 BuildRequires:  cscope
 BuildRequires:  dejagnu
 BuildRequires:  expect