--- intltool-0.51.0/intltool-update.in.orig	2015-03-09 01:39:54.000000000 +0000

+++ intltool-0.51.0/intltool-update.in	2017-11-12 13:48:23.236000000 +0000

@@ -1062,13 +1062,13 @@

 	}

     }

-    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)

+    if ($str =~ /^(.*)\$\{?([A-Z_]+)\}?(.*)$/)

     {

 	my $rest = $3;

 	my $untouched = $1;

 	my $sub = "";

         # Ignore recursive definitions of variables

-        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\${?$2}?/;

+        $sub = $varhash{$2} if defined $varhash{$2} and $varhash{$2} !~ /\$\{?$2\}?/;

 	return SubstituteVariable ("$untouched$sub$rest");

     }

@@ -1190,10 +1190,10 @@

 	$name    =~ s/\(+$//g;

 	$version =~ s/\(+$//g;

-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);

-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);

-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);

-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);

+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/);

+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/);

+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/);

+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/);

     }

     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)

@@ -1219,11 +1219,11 @@

 	$version =~ s/\(+$//g;

         $bugurl  =~ s/\(+$//g if (defined $bugurl);

-	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);

-	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);

-	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);

-	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);

-        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);

+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/);

+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/);

+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/);

+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/);

+        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+\}?/);

     }

     # \s makes this not work, why?