[packages/adapter: 544/631] - replace systemd macros before libdir, to have chance to work on 32bit libdirs

glen glen at pld-linux.org
Mon Sep 12 20:20:02 CEST 2016


commit 85084f0d0a53f8a05c1948d7da008c5446ad7f37
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Fri Mar 30 18:43:27 2012 +0000

    - replace systemd macros before libdir, to have chance to work on 32bit libdirs
    
    Changed files:
        adapter.awk -> 1.512

 adapter.awk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index 169684a..3b7c7ce 100644
--- 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)
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list