Changeset 46

Timestamp:

02/24/06 16:41:44 (18 years ago)

Author:

kdeugau

Message:

/trunk

Fix macro expansion in %files; %config entries didn't get
macro-expanded. :(

File:

• trunk/debbuild (modified) (3 diffs)

trunk/debbuild

@@ -481 +481 @@
             $pkgdata{$pkgname}{conffiles} = 1;  # Flag it for later
             my $tmp = $1;       # Now we can mangleificationate it.  And we probably need to.  :/
+            $tmp = expandmacros($tmp, 'gp');  # Expand common macros
             if ($tmp !~ /\s+/) {
               # Simplest case, just a file.  Whew.
@@ -488 +489 @@
               # Wot?  Spaces?  That means extra %-macros.  Which, for the most part, can be ignored.
               ($tmp) = ($tmp =~ /.+\s([^\s]+)/);  # Strip everything before the last space
-              $tmp = expandmacros($tmp, 'gp');  # Expand common macros
               push @{$pkgdata{$pkgname}{conflist}}, $tmp;
               $filelist{$pkgname} .= " $tmp";
@@ -509 +509 @@
           $filelist{$pkgname} .= " $_";
         }
-        $filelist{$pkgname} = expandmacros($filelist{$pkgname}, 'g');
+        $filelist{$pkgname} = expandmacros($filelist{$pkgname}, 'gp');
       } # done %file section