summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <hun@n-dimensional.de>2017-07-18 07:09:43 +0200
committerHans Ulrich Niedermann <hun@n-dimensional.de>2017-07-18 07:09:43 +0200
commita3c9563d9e88b54100eb2e0f4c3b8a4450d0c498 (patch)
tree049c9e0bb2485f910da06e429f485f4ec565daca
parentb99eb95676b78e1acd983735f265d4666b27de5d (diff)
downloadlibgphoto2-a3c9563d9e88b54100eb2e0f4c3b8a4450d0c498.tar.gz
Consistently define driverdir in all *.pc files
Define driverdir both for libgphoto2 and libgphoto2_port, and both for the -uninstalled and the installed *.pc files.
-rw-r--r--libgphoto2-uninstalled.pc.in3
-rw-r--r--libgphoto2_port/libgphoto2_port-uninstalled.pc.in3
-rw-r--r--libgphoto2_port/libgphoto2_port.pc.in1
3 files changed, 5 insertions, 2 deletions
diff --git a/libgphoto2-uninstalled.pc.in b/libgphoto2-uninstalled.pc.in
index c90d7177b..b3c6fc93d 100644
--- a/libgphoto2-uninstalled.pc.in
+++ b/libgphoto2-uninstalled.pc.in
@@ -10,7 +10,8 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
VERSION=@VERSION@
-driverdir=@camlibdir@
+abs_top_builddir=@abs_top_builddir@
+driverdir=${abs_top_builddir}/camlibs
Name: libgphoto2
Description: Library for easy access to digital cameras
diff --git a/libgphoto2_port/libgphoto2_port-uninstalled.pc.in b/libgphoto2_port/libgphoto2_port-uninstalled.pc.in
index da8f38af8..7dc6fe984 100644
--- a/libgphoto2_port/libgphoto2_port-uninstalled.pc.in
+++ b/libgphoto2_port/libgphoto2_port-uninstalled.pc.in
@@ -10,7 +10,8 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
VERSION=@VERSION@
-driverdir=@camlibdir@
+abs_top_builddir=@abs_top_builddir@
+driverdir=${abs_top_builddir}
Name: libgphoto2_port
Description: Library for easy access to digital cameras
diff --git a/libgphoto2_port/libgphoto2_port.pc.in b/libgphoto2_port/libgphoto2_port.pc.in
index 999e37f1f..a8c2bb0ae 100644
--- a/libgphoto2_port/libgphoto2_port.pc.in
+++ b/libgphoto2_port/libgphoto2_port.pc.in
@@ -3,6 +3,7 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
VERSION=@VERSION@
+driverdir=@iolibdir@
Name: libgphoto2_port
Description: Device-independent access to serial, USB, and other ports