48 lines
1.4 KiB
Diff
48 lines
1.4 KiB
Diff
|
parent 418376c88519e3585e1b2c34fba133b7cc015985 (atheme-services-7.0.0-alpha7-627-g418376c)
|
||
|
|
commit 0c5c860727019adc6ddb2e8b6f29268e51377cb3
|
||
|
|
Author: Jan Engelhardt <jengelh@inai.de>
|
||
|
|
Date: Wed Jun 6 21:43:09 2012 +0200
|
||
|
|
|
||
|
|
build: avoid undefined variables in .pc file
|
||
|
|
|
||
|
|
Here is an odd thing. If an undeclared variable is used, `pkg-config
|
||
|
|
--print-provides foo.pc` will not show anything. The default value
|
||
|
|
for MODDIR is "${libdir}/atheme/modules", but atheme-services.pc
|
||
|
|
uses the non-standard "lib_dir".
|
||
|
|
|
||
|
|
So, just use the standard names (without underscore) like everybody
|
||
|
|
else, to make dependency discovery with pkgconfig working again.
|
||
|
|
---
|
||
|
|
atheme-services.pc.in | 12 ++++++------
|
||
|
|
1 files changed, 6 insertions(+), 6 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/atheme-services.pc.in b/atheme-services.pc.in
|
||
|
|
index 97b21ad..84e52c8 100644
|
||
|
|
--- a/atheme-services.pc.in
|
||
|
|
+++ b/atheme-services.pc.in
|
||
|
|
@@ -1,16 +1,16 @@
|
||
|
|
prefix=@prefix@
|
||
|
|
exec_prefix=@exec_prefix@
|
||
|
|
datarootdir=@datarootdir@
|
||
|
|
-data_dir=@datadir@/@PACKAGE_NAME@
|
||
|
|
+datadir=@datadir@/@PACKAGE_NAME@
|
||
|
|
+
|
||
|
|
MODDIR=@MODDIR@/modules
|
||
|
|
-
|
||
|
|
version=@PACKAGE_VERSION@
|
||
|
|
-include_dir=@includedir@/@PACKAGE_NAME@
|
||
|
|
-lib_dir=@libdir@
|
||
|
|
+includedir=@includedir@/@PACKAGE_NAME@
|
||
|
|
+libdir=@libdir@
|
||
|
|
|
||
|
|
Name: atheme-services
|
||
|
|
Description: Atheme IRC services (for building modules)
|
||
|
|
Version: @PACKAGE_VERSION@
|
||
|
|
-Libs: -L${lib_dir} -lathemecore
|
||
|
|
-Cflags: -I${include_dir}
|
||
|
|
+Libs: -L${libdir} -lathemecore
|
||
|
|
+Cflags: -I${includedir}
|
||
|
|
|
||
|
|
--
|
||
|
|
# Created with git-export-patch
|