r420: big monsta changes

1 files changed, 11 insertions, 10 deletions

diff --git a/dh_installxaw b/dh_installxaw
index 5cb94e24..e5ecf93d 100755
--- a/dh_installxaw
+++ b/dh_installxaw
@@ -3,23 +3,24 @@
 # Integration with xaw-wrappers
 #
 # If debian/xaw-wrappers file exists, save it to 
-# $TMP/usr/share/xaw-wrappers/config/$PACKAGE
+# $tmp/usr/share/xaw-wrappers/config/$package
 #
 # Also, add calls to postinst and postrm.
 
+use strict;
 use Debian::Debhelper::Dh_Lib;
 init();
 
-foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
-	$TMP=tmpdir($PACKAGE);
-	$xaw=pkgfile($PACKAGE,'xaw');
+foreach my $package (@{$dh{DOPACKAGES}}) {
+	my $tmp=tmpdir($package);
+	my $xaw=pkgfile($package,'xaw');
 
 	if ($xaw ne '') {
-		if (! -d "$TMP/usr/share/xaw-wrappers/config") {
-			doit("install","-d","$TMP/usr/share/xaw-wrappers/config");
+		if (! -d "$tmp/usr/share/xaw-wrappers/config") {
+			doit("install","-d","$tmp/usr/share/xaw-wrappers/config");
 		}
 		doit("install","-p","-m644",$xaw,
-			"$TMP/usr/share/xaw-wrappers/config/$PACKAGE");
+			"$tmp/usr/share/xaw-wrappers/config/$package");
 
 		if (! $dh{NOSCRIPTS}) {
 			# Parse the xaw conf file to figure out what programs
@@ -54,11 +55,11 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
 				$remove_opts.="'$data{'link-name'} $data{wrapped}'";
 			}
 			
-			autoscript($PACKAGE,"postinst","postinst-xaw",
+			autoscript($package,"postinst","postinst-xaw",
 				"s:#OPTS#:$install_opts:");
-			autoscript($PACKAGE,"prerm","prerm-xaw",
+			autoscript($package,"prerm","prerm-xaw",
 				"s:#OPTS#:$remove_opts:");
-			autoscript($PACKAGE,"postrm","postrm-xaw");
+			autoscript($package,"postrm","postrm-xaw");
 		}
 	}
 }