- more macros substytution:

s#%{_prefix}/bin#%{_bindir}#
s#%{prefix}/bin#%{_bindir}#
s#%{prefix}/sbin#%{_sbindir}#
s#%{_prefix}/sbib#%{_sbindir}#
s#%{prefix}/lib#%{_libdir}#
s#%{_prefix}/lib#%{_libdir}#
s#%{prefix}/share#%{_datadir}#
s#%{_prefix}/share#%{_datadir}#
s#%{prefix}/include#%{_includedir}#
s#%{_prefix}/include#%{_includedir}#
s#%{prefix}/man#%{_mandir}#
s#%{_prefix}/man#%{_mandir}#
s#%{prefix}/info#%{_infodir}#
s#%{_prefix}/info#%{_infodir}#
s#%{prefix}/info#%{_infodir}#
s#%{prefix}#%{_prefix}#

Changed files:
    adapter.awk -> 1.21

diff --git a/adapter.awk b/adapter.awk
index daaed9ff00bac3fb785e15059e250c26c317ac11..c621da93137030de3a1287f284f1f116e5798a82 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -337,13 +337,35 @@ function format_preamble()
 function use_macros()
 {
        gsub(bindir, "%{_bindir}")
+       gsub("%{_prefix}/bin", "%{_bindir}")
+       gsub("%{prefix}/bin", "%{_bindir}")
+
        gsub(sbindir, "%{_sbindir}")
+       gsub("%{prefix}/sbin", "%{_sbindir}")
+       gsub("%{_prefix}/sbib", "%{_sbindir}")
+
        gsub(libdir, "%{_libdir}")
+       gsub("%{prefix}/lib", "%{_libdir}")
+       gsub("%{_prefix}/lib", "%{_libdir}")
+
        gsub(sysconfdir, "%{_sysconfdir}")
+
        gsub(datadir, "%{_datadir}")
+       gsub("%{prefix}/share", "%{_datadir}")
+       gsub("%{_prefix}/share", "%{_datadir}")
+
        gsub(includedir, "%{_includedir}")
+       gsub("%{prefix}/include", "%{_includedir}")
+       gsub("%{_prefix}/include", "%{_includedir}")
+
        gsub(mandir, "%{_mandir}")
+       gsub("%{prefix}/man", "%{_mandir}")
+       gsub("%{_prefix}/man", "%{_mandir}")
+
        gsub(infodir, "%{_infodir}")
+       gsub("%{prefix}/info", "%{_infodir}")
+       gsub("%{_prefix}/info", "%{_infodir}")
+
        gsub(prefix, "%{_prefix}")
+       gsub("%{prefix}", "%{_prefix}")
 }
-