Changeset 107


Ignore:
Timestamp:
06/22/07 13:03:21 (18 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:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/debbuild

    r106 r107  
    677677        $prepscript .= " -s <$topdir/SOURCES/".$pkgdata{main}{"patch$patchnum"}."\n";
    678678      } else {
    679         $prepscript .= $_;
     679        $prepscript .= expandmacros($_,'gp');
    680680      }
    681681      next LINE;
     
    690690        $buildscript .= expandmacros($_,'mgbp');
    691691      } else {
    692         $buildscript .= $_;
     692        $buildscript .= expandmacros($_.'gp');
    693693      }
    694694      next LINE;
     
    699699        $installscript .= expandmacros($_,'igbp');
    700700      } else {
    701         $installscript .= $_;
     701        $installscript .= expandmacros($_,'gp');
    702702      }
    703703      next LINE;
     
    705705
    706706    if ($stage eq 'clean') {
    707       $cleanscript .= $_;
     707      $cleanscript .= expandmacros($_,'gp');
    708708      next LINE;
    709709    } # clean
    710710
    711711    if ($stage eq 'prepost') {
    712       $pkgdata{$subname}{$scriptlet} .= $_;
     712      $pkgdata{$subname}{$scriptlet} .= expandmacros($_,'gp');
    713713      next LINE;
    714714    } # prepost
     
    774774
    775775    if ($stage eq 'changelog') {
     776      # this is one of the few places we do NOT generally want to replace macros...
    776777      $pkgdata{main}{changelog} .= $_;
    777778    }
Note: See TracChangeset for help on using the changeset viewer.