- Honours redefinitions of "_prefix". E.g. will not replace "/usr/bin" with

  "%{_bindir}" if "_prefix" is defined as "/usr/X11R6".

Changed files:
    adapter.awk -> 1.58

diff --git a/adapter.awk b/adapter.awk
index f639e018ad9b2574422ed5ad77dde9c85cf82db4..98c9e3b3786c7a8ef8622ee13ca72ec926d86088 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -280,6 +280,11 @@ preamble == 1 {
        if ($1 ~ /%define/) {
                # Do not add %define of _prefix if it already is.
                if ($2 ~ /_prefix/) {
+                       sub("^"prefix, $3, bindir)
+                       sub("^"prefix, $3, sbindir)
+                       sub("^"prefix, $3, libdir)
+                       sub("^"prefix, $3, datadir)
+                       sub("^"prefix, $3, includedir)
                        prefix = $3
                        x11 = 2
                }