Changeset 84

Timestamp:

03/22/07 16:03:21 (17 years ago)

Author:

kdeugau

Message:

/trunk

Fix %files glitch with macro expansion by pedanticising several macros
and adding %{_datadir} expansion to the general macros section

File:

• trunk/debbuild (modified) (3 diffs)

trunk/debbuild

@@ -629 +629 @@
           $filelist{$pkgname} .= " $_";
         }
-        $filelist{$pkgname} = expandmacros($filelist{$pkgname}, 'gp');
       } # done %file section
 
@@ -1229 +1228 @@
     $macrostring =~ s|%{_infodir}|%{_datadir}/info|g;                   #/usr/share/info
     $macrostring =~ s|%{_oldincludedir}|/usr/include|g;         #/usr/include
-    $macrostring =~ s|%{_includedir}|%{_prefix\}/include|g;     #/usr/include
+    $macrostring =~ s|%{_includedir}|%{_prefix}/include|g;      #/usr/include
     $macrostring =~ s|%{_libdir}|%{_exec_prefix}/%{_lib}|g;     #/usr/lib
     $macrostring =~ s|%{_lib}|lib|g;                                    #?
@@ -1273 +1272 @@
     $macrostring =~ s|%{_topdir}|$topdir|g;
     $macrostring =~ s|%{_tmppath}|$tmpdir|g;
-    $macrostring =~ s'%{_docdir}'/usr/share/doc'g;
+    $macrostring =~ s'%{_docdir}'%{_datadir}/doc'g;
 
     # Standard FHS locations.  More or less.
     $macrostring =~ s'%{_bindir}'/usr/bin'g;
     $macrostring =~ s'%{_sbindir}'/usr/sbin'g;
-    $macrostring =~ s'%{_mandir}'/usr/share/man'g;
+    $macrostring =~ s'%{_mandir}'%{_datadir}/man'g;
     $macrostring =~ s'%{_includedir}'/usr/include'g;
     $macrostring =~ s'%{_libdir}'/usr/lib'g;
     $macrostring =~ s'%{_sysconfdir}'/etc'g;
     $macrostring =~ s'%{_localstatedir}'/var'g;
+
+    # FHS-ish locations that aren't quite actually FHS-specified.
+    $macrostring =~ s'%{_datadir}'/usr/share'g;
 
     # %define's