Changeset 107 for trunk

Timestamp:

06/22/07 13:03:21 (17 years ago)

Author:

kdeugau

Message:

/trunk

Fix %install scriptlet missing macro (pre)processing, and pre-emptively
munge the processing for other scriptlets the same way.

File:

• trunk/debbuild (modified) (5 diffs)

trunk/debbuild

@@ -677 +677 @@
         $prepscript .= " -s <$topdir/SOURCES/".$pkgdata{main}{"patch$patchnum"}."\n";
       } else {
-        $prepscript .= $_;
+        $prepscript .= expandmacros($_,'gp');
       }
       next LINE;
@@ -690 +690 @@
         $buildscript .= expandmacros($_,'mgbp');
       } else {
-        $buildscript .= $_;
+        $buildscript .= expandmacros($_.'gp');
       }
       next LINE;
@@ -699 +699 @@
         $installscript .= expandmacros($_,'igbp');
       } else {
-        $installscript .= $_;
+        $installscript .= expandmacros($_,'gp');
       }
       next LINE;
@@ -705 +705 @@
 
     if ($stage eq 'clean') {
-      $cleanscript .= $_;
+      $cleanscript .= expandmacros($_,'gp');
       next LINE;
     } # clean
 
     if ($stage eq 'prepost') {
-      $pkgdata{$subname}{$scriptlet} .= $_;
+      $pkgdata{$subname}{$scriptlet} .= expandmacros($_,'gp');
       next LINE;
     } # prepost
@@ -774 +774 @@
 
     if ($stage eq 'changelog') {
+      # this is one of the few places we do NOT generally want to replace macros...
       $pkgdata{main}{changelog} .= $_;
     }