- replace systemd macros before libdir, to have chance to work on 32bit libdirs

Changed files:
    adapter.awk -> 1.512

diff --git a/adapter.awk b/adapter.awk
index 169684ae1d87f2de665859ecdf7e4702105fd7aa..3b7c7cea429086d02313a903eff091ed82306056 100644 (file)
--- a/adapter.awk
+++ b/adapter.awk
@@ -1187,6 +1187,9 @@ function use_macros()
        gsub(ruby_sitelibdir, "%{ruby_sitelibdir}")
        gsub(ruby_rdocdir, "%{ruby_rdocdir}")
 
+       gsub(systemdunitdir, "%{systemdunitdir}")
+       gsub(systemdtmpfilesdir, "%{systemdtmpfilesdir}")
+
        gsub("%{_datadir}/applications", "%{_desktopdir}")
        gsub("%{_datadir}/pixmaps", "%{_pixmapsdir}")
        gsub("%{_datadir}/java", "%{_javadir}")
@@ -1203,9 +1206,6 @@ function use_macros()
        gsub(libdir, "%{_libdir}")
        gsub(javadir, "%{_javadir}")
 
-       gsub(systemdunitdir, "%{systemdunitdir}")
-       gsub(systemdtmpfilesdir, "%{systemdtmpfilesdir}")
-
        gsub(bindir, "%{_bindir}")
        gsub("%{prefix}/bin", "%{_bindir}")
        if (prefix"/bin" == bindir)