Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/intltool/ChangeLog,v
retrieving revision 1.242
diff -u -r1.242 ChangeLog
--- ChangeLog	2 May 2002 00:49:40 -0000	1.242
+++ ChangeLog	2 May 2002 01:46:40 -0000
@@ -1,3 +1,8 @@
+2002-05-02  Abel Cheung  <maddog@linux.org.hk>
+
+	* intltool-update.in.in: Fix regex bug I introduced, so that
+	some non-word characters are allowed in package name.
+
 2002-05-02  Kenneth Christiansen  <kenneth@gnu.org>  
 
         * configure.in: Bump version.
Index: intltool-update.in.in
===================================================================
RCS file: /cvs/gnome/intltool/intltool-update.in.in,v
retrieving revision 1.66
diff -u -r1.66 intltool-update.in.in
--- intltool-update.in.in	2 May 2002 00:47:43 -0000	1.66
+++ intltool-update.in.in	2 May 2002 01:46:40 -0000
@@ -595,18 +595,18 @@
         }
 
 	my $name = "";
-	$name = $1 if $conf_source =~ /^AM_INIT_AUTOMAKE\(\[?([\$\w]+)/m;
-	if ($conf_source =~ /^AC_INIT\(\[?([\$\w]+)\]?\s*,/m) {
+	$name = $1 if $conf_source =~ /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m;
+	if ($conf_source =~ /^AC_INIT\([\s\[]*([^,\)\s\]]+)\]?\s*,/m) {
 	    $name = $1;
 	    $varhash{"AC_PACKAGE_NAME"} = $1;
 	}
-	$name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=([\$\w]+)/m;
+	$name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\s\]]+)/m;
 
 	$name = "\$AC_PACKAGE_NAME" if "$name" eq "AC_PACKAGE_NAME";
 
-	while ($name =~ /[\$](\w+)/) {
+	while ($name =~ /[\$](\S+)/) {
 	    if (exists $varhash{$1}) {
-		$name =~ s/[\$](\w+)/$varhash{$1}/;
+		$name =~ s/[\$](\S+)/$varhash{$1}/;
 	    }
 	}
 	return $name if $name;
