Changeset 24

Timestamp:

12/05/05 18:21:29 (19 years ago)

Author:

kdeugau

Message:

/trunk

Checkpoint

File:

• trunk/debbuild (modified) (6 diffs)

trunk/debbuild

@@ -370 +370 @@
             $buildscript .= expandmacros($_,'mgbp');
           } else {
-            last BUILDSCRIPT if /^\%/;
+            last BUILDSCRIPT if /^\%[^{]/;
             $buildscript .= $_;
           }
@@ -426 +426 @@
         my $pkgname = 'main';
         if ($1) {
-          if (/-n/) { $pkgname = $1; } else { $pkgname = "$name-$1"; }
+          if (/-n/) { $pkgname = $1; } else { $pkgname = "$pkgdata{main}{name}-$1"; }
           # subpackage not based on "main" package
           while (<SPECFILE>) {
@@ -450 +450 @@
         $pkgdata{main}{summary} = $1;
       } elsif (/^name:\s+(.+)/i) {
-        $pkgdata{main}{name} = $1;
+        $pkgdata{main}{name} = expandmacros($1,'g');
       } elsif (/^version:\s+(.+)/i) {
-        $pkgdata{main}{version} = $1;
+        $pkgdata{main}{version} = expandmacros($1,'g');
       } elsif (/^release:\s+(.+)/i) {
-        $pkgdata{main}{release} = $1;
+        $pkgdata{main}{release} = expandmacros($1,'g');
       } elsif (/^group:\s+(.+)/i) {
         $pkgdata{main}{group} = $1;
@@ -505 +505 @@
   $prepscript = expandmacros($prepscript,'gp');
 
-print $prepscript; exit 0;
+#print $prepscript; exit 0;
 
   # create script filename
@@ -710 +710 @@
   if ($section =~ /i/) {
     # This is where we need to mangle $prefix.
-    $macrostring =~ s'%makeinstall'make %{fhs}
-        install';
+    $macrostring =~ s'%makeinstall'make %{fhs} install';
     $prefix = $buildroot;
   } # done %install and/or %makeinstall
@@ -718 +717 @@
   # Note that these are processed in reverse order to get the substitution order right
   if ($section =~ /b/) {
-    $macrostring =~ s'%{fhs}'host=$DEB_HOST_GNU_TYPE \
-        build=$DEB_BUILD_GNU_TYPE \
-        prefix=%{_prefix} \
+#    $macrostring =~ s'%{fhs}'host=$DEB_HOST_GNU_TYPE \
+#       build=$DEB_BUILD_GNU_TYPE \
+    $macrostring =~ s'%{fhs}'prefix=%{_prefix} \
         exec-prefix=%{_exec_prefix} \
         bindir=%{_bindir} \