You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

206 lines
5.2 KiB

  1. From 229b216d274977967790e6e2cfe13dd38effa2cf Mon Sep 17 00:00:00 2001
  2. From: Rosen Penev <rosenp@gmail.com>
  3. Date: Mon, 16 Sep 2019 18:04:58 -0700
  4. Subject: [PATCH] pkgconfig: Match the first three parameters
  5. For consistency between projects. Might also fix several cross compilation
  6. cases.
  7. Signed-off-by: Rosen Penev <rosenp@gmail.com>
  8. ---
  9. avahi-client.pc.in | 4 ++--
  10. avahi-compat-howl.pc.in | 4 ++--
  11. avahi-compat-libdns_sd.pc.in | 4 ++--
  12. avahi-core.pc.in | 4 ++--
  13. avahi-glib.pc.in | 4 ++--
  14. avahi-gobject.pc.in | 4 ++--
  15. avahi-libevent.pc.in | 4 ++--
  16. avahi-qt3.pc.in | 4 ++--
  17. avahi-qt4.pc.in | 4 ++--
  18. avahi-qt5.pc.in | 4 ++--
  19. avahi-sharp.pc.in | 2 +-
  20. avahi-ui-gtk3.pc.in | 4 ++--
  21. avahi-ui-sharp.pc.in | 2 +-
  22. avahi-ui.pc.in | 4 ++--
  23. 14 files changed, 26 insertions(+), 26 deletions(-)
  24. diff --git a/avahi-client.pc.in b/avahi-client.pc.in
  25. index 65ee8d84..1e1bd249 100644
  26. --- a/avahi-client.pc.in
  27. +++ b/avahi-client.pc.in
  28. @@ -1,6 +1,6 @@
  29. prefix=@prefix@
  30. -exec_prefix=${prefix}
  31. -libdir=@libdir@
  32. +exec_prefix=@prefix@
  33. +libdir=${exec_prefix}/lib
  34. includedir=${prefix}/include
  35. Name: avahi-client
  36. diff --git a/avahi-compat-howl.pc.in b/avahi-compat-howl.pc.in
  37. index b3cd02a7..1bb42c6b 100644
  38. --- a/avahi-compat-howl.pc.in
  39. +++ b/avahi-compat-howl.pc.in
  40. @@ -1,6 +1,6 @@
  41. prefix=@prefix@
  42. -exec_prefix=${prefix}
  43. -libdir=@libdir@
  44. +exec_prefix=@prefix@
  45. +libdir=${exec_prefix}/lib
  46. includedir=${prefix}/include/avahi-compat-howl/
  47. Name: avahi-compat-howl
  48. diff --git a/avahi-compat-libdns_sd.pc.in b/avahi-compat-libdns_sd.pc.in
  49. index d6196325..d4778a17 100644
  50. --- a/avahi-compat-libdns_sd.pc.in
  51. +++ b/avahi-compat-libdns_sd.pc.in
  52. @@ -1,6 +1,6 @@
  53. prefix=@prefix@
  54. -exec_prefix=${prefix}
  55. -libdir=@libdir@
  56. +exec_prefix=@prefix@
  57. +libdir=${exec_prefix}/lib
  58. includedir=${prefix}/include/avahi-compat-libdns_sd/
  59. Name: avahi-compat-libdns_sd
  60. diff --git a/avahi-core.pc.in b/avahi-core.pc.in
  61. index 52491b41..73412d45 100644
  62. --- a/avahi-core.pc.in
  63. +++ b/avahi-core.pc.in
  64. @@ -1,6 +1,6 @@
  65. prefix=@prefix@
  66. -exec_prefix=${prefix}
  67. -libdir=@libdir@
  68. +exec_prefix=@prefix@
  69. +libdir=${exec_prefix}/lib
  70. includedir=${prefix}/include
  71. Name: avahi-core
  72. diff --git a/avahi-glib.pc.in b/avahi-glib.pc.in
  73. index f163e899..3d0ff9fc 100644
  74. --- a/avahi-glib.pc.in
  75. +++ b/avahi-glib.pc.in
  76. @@ -1,6 +1,6 @@
  77. prefix=@prefix@
  78. -exec_prefix=${prefix}
  79. -libdir=@libdir@
  80. +exec_prefix=@prefix@
  81. +libdir=${exec_prefix}/lib
  82. includedir=${prefix}/include
  83. Name: avahi-glib
  84. diff --git a/avahi-gobject.pc.in b/avahi-gobject.pc.in
  85. index bf382003..88146744 100644
  86. --- a/avahi-gobject.pc.in
  87. +++ b/avahi-gobject.pc.in
  88. @@ -1,6 +1,6 @@
  89. prefix=@prefix@
  90. -exec_prefix=${prefix}
  91. -libdir=@libdir@
  92. +exec_prefix=@prefix@
  93. +libdir=${exec_prefix}/lib
  94. includedir=${prefix}/include
  95. Name: avahi-gobject
  96. diff --git a/avahi-libevent.pc.in b/avahi-libevent.pc.in
  97. index a1dca01b..59b35e8e 100644
  98. --- a/avahi-libevent.pc.in
  99. +++ b/avahi-libevent.pc.in
  100. @@ -1,6 +1,6 @@
  101. prefix=@prefix@
  102. -exec_prefix=${prefix}
  103. -libdir=@libdir@
  104. +exec_prefix=@prefix@
  105. +libdir=${exec_prefix}/lib
  106. includedir=${prefix}/include
  107. Name: avahi-libevent
  108. diff --git a/avahi-qt3.pc.in b/avahi-qt3.pc.in
  109. index c18f0809..d4fb4b88 100644
  110. --- a/avahi-qt3.pc.in
  111. +++ b/avahi-qt3.pc.in
  112. @@ -1,6 +1,6 @@
  113. prefix=@prefix@
  114. -exec_prefix=${prefix}
  115. -libdir=@libdir@
  116. +exec_prefix=@prefix@
  117. +libdir=${exec_prefix}/lib
  118. includedir=${prefix}/include
  119. Name: avahi-qt3
  120. diff --git a/avahi-qt4.pc.in b/avahi-qt4.pc.in
  121. index f62f7171..aefc135a 100644
  122. --- a/avahi-qt4.pc.in
  123. +++ b/avahi-qt4.pc.in
  124. @@ -1,6 +1,6 @@
  125. prefix=@prefix@
  126. -exec_prefix=${prefix}
  127. -libdir=@libdir@
  128. +exec_prefix=@prefix@
  129. +libdir=${exec_prefix}/lib
  130. includedir=${prefix}/include
  131. Name: avahi-qt4
  132. diff --git a/avahi-qt5.pc.in b/avahi-qt5.pc.in
  133. index 71548baf..fffe192a 100644
  134. --- a/avahi-qt5.pc.in
  135. +++ b/avahi-qt5.pc.in
  136. @@ -1,6 +1,6 @@
  137. prefix=@prefix@
  138. -exec_prefix=${prefix}
  139. -libdir=@libdir@
  140. +exec_prefix=@prefix@
  141. +libdir=${exec_prefix}/lib
  142. includedir=${prefix}/include
  143. Name: avahi-qt5
  144. diff --git a/avahi-sharp.pc.in b/avahi-sharp.pc.in
  145. index 3cc78b60..4d4c15df 100644
  146. --- a/avahi-sharp.pc.in
  147. +++ b/avahi-sharp.pc.in
  148. @@ -1,6 +1,6 @@
  149. prefix=@prefix@
  150. exec_prefix=@prefix@
  151. -libdir=@libdir@
  152. +libdir=${exec_prefix}/lib
  153. Name: avahi-sharp
  154. Description: Mono bindings for the Avahi mDNS/DNS-SD stack
  155. diff --git a/avahi-ui-gtk3.pc.in b/avahi-ui-gtk3.pc.in
  156. index 27c4322d..56159481 100644
  157. --- a/avahi-ui-gtk3.pc.in
  158. +++ b/avahi-ui-gtk3.pc.in
  159. @@ -1,6 +1,6 @@
  160. prefix=@prefix@
  161. -exec_prefix=${prefix}
  162. -libdir=@libdir@
  163. +exec_prefix=@prefix@
  164. +libdir=${exec_prefix}/lib
  165. includedir=${prefix}/include
  166. Name: avahi-ui
  167. diff --git a/avahi-ui-sharp.pc.in b/avahi-ui-sharp.pc.in
  168. index cdc35e0d..d448b241 100644
  169. --- a/avahi-ui-sharp.pc.in
  170. +++ b/avahi-ui-sharp.pc.in
  171. @@ -1,6 +1,6 @@
  172. prefix=@prefix@
  173. exec_prefix=@prefix@
  174. -libdir=@libdir@
  175. +libdir=${exec_prefix}/lib
  176. Name: avahi-ui-sharp
  177. Description: Mono bindings for the Avahi mDNS/DNS-SD stack
  178. diff --git a/avahi-ui.pc.in b/avahi-ui.pc.in
  179. index 9edeea96..0dab729a 100644
  180. --- a/avahi-ui.pc.in
  181. +++ b/avahi-ui.pc.in
  182. @@ -1,6 +1,6 @@
  183. prefix=@prefix@
  184. -exec_prefix=${prefix}
  185. -libdir=@libdir@
  186. +exec_prefix=@prefix@
  187. +libdir=${exec_prefix}/lib
  188. includedir=${prefix}/include
  189. Name: avahi-ui