Index: /trunk/debbuild
===================================================================
--- /trunk/debbuild	(revision 208)
+++ /trunk/debbuild	(revision 209)
@@ -951,5 +951,4 @@
 
         $prepscript .= "cd '$topdir/BUILD'\n";
-        $tarballdir = expandmacros($tarballdir,'gp');
         $prepscript .= "rm -rf '$tarballdir'\n" if $deldir;
         $prepscript .= "/bin/mkdir -p $tarballdir\n" if $changedir;
@@ -1034,4 +1033,6 @@
           } elsif ($popt =~ (/^-E/) ) {
             $noempty = 1;
+          } elsif ($popt =~ (/^(-[^s]+)/) ) {
+            die "Unknown \%patch option $1: $line\n";
           }
         } # while (shift @pbits)
@@ -2025,6 +2026,6 @@
 
     $macrostring =~ s|%{_builddir}|%{_topdir}/BUILD|g;
-# no longer a valid macro/tag
-#    $macrostring =~ s|%{buildsubdir}|$tarballdir|g;
+# Not predefined in an eternal file;  defaults to %{name}-%{version}
+    $macrostring =~ s|%{buildsubdir}|$tarballdir|g;
     $macrostring =~ s|%{_topdir}|$topdir|g;
     $macrostring =~ s|%{_tmppath}|$tmpdir|g;