[packages/adapter: 21/631] - more macros substytution: s#%{_prefix}/bin#%{_bindir}# s#%{prefix}/bin#%{_bindir}# s#%{prefix}/sbi

[glen]

commit 74edc57e413ea20f8ec99844d3da44fde4ec5063
Author: kloczek <kloczek at pld-linux.org>
Date:   Sun Feb 20 08:29:12 2000 +0000

    - 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

 adapter.awk | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/adapter.awk b/adapter.awk
index daaed9f..c621da9 100644
--- 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}")
 }
-
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885