SPECS (DEVEL): adapter.spec, adapter.awk - _pkgconfigdir macro
glen
glen at pld-linux.org
Mon Oct 10 10:24:10 CEST 2005
Author: glen Date: Mon Oct 10 08:24:10 2005 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- _pkgconfigdir macro
---- Files affected:
SPECS:
adapter.spec (1.26.2.10 -> 1.26.2.11) , adapter.awk (1.194 -> 1.195)
---- Diffs:
================================================================
Index: SPECS/adapter.spec
diff -u SPECS/adapter.spec:1.26.2.10 SPECS/adapter.spec:1.26.2.11
--- SPECS/adapter.spec:1.26.2.10 Sun Oct 2 20:22:24 2005
+++ SPECS/adapter.spec Mon Oct 10 10:24:03 2005
@@ -122,6 +122,11 @@
%attr(600,root,root) %config(noreplace) %verify(not mtime md5 size) %ghost %{supervise}/log/supervise/*
%attr(600,root,root) %config(noreplace) %verify(not md5 mtime size) %ghost %{supervise}/log/supervise/*
+/usr/lib64/pkgconfig/foo.pc
+/usr/lib/pkgconfig/foo.pc
+%{_libdir}/pkgconfig/foo.pc
+%{_prefix}/lib/pkgconfig/foo.pc
+
%dir /usr/share/python2.4/site-packages/pdlanalyzer/
%dir %{py_sitescriptdir}/pdlanalyzer
@@ -150,6 +155,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.26.2.11 2005/10/10 08:24:03 glen
+- _pkgconfigdir macro
+
Revision 1.26.2.10 2005/10/02 18:22:24 glen
- %useradd/%groupadd may not be continued with backslash
================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.194 SPECS/adapter.awk:1.195
--- SPECS/adapter.awk:1.194 Sun Oct 9 18:32:05 2005
+++ SPECS/adapter.awk Mon Oct 10 10:24:04 2005
@@ -845,7 +845,10 @@
}
gsub(examplesdir, "%{_examplesdir}")
- gsub("/usr/lib/pkgconfig", "%{_libdir}/pkgconfig")
+
+ gsub(libdir "/pkgconfig", "%{_pkgconfigdir}");
+ gsub("%{_libdir}/pkgconfig", "%{_pkgconfigdir}");
+ gsub("%{_prefix}/lib/pkgconfig", "%{_pkgconfigdir}");
if (prefix != "/") {
# leave --with-foo=/usr alone
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/adapter.spec?r1=1.26.2.10&r2=1.26.2.11&f=u
http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.194&r2=1.195&f=u
More information about the pld-cvs-commit
mailing list