summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans Ulrich Niedermann <gp@n-dimensional.de>2007-09-12 17:55:29 +0000
committerHans Ulrich Niedermann <gp@n-dimensional.de>2007-09-12 17:55:29 +0000
commit32a389118276d263c951b3a2338386288ec79fd2 (patch)
treeace8c23d1d7e4c7051c86c8f62bfcc5f1acf6ff6
parent38e0a7e46904137451c1c7621b33957b4b7a3ab6 (diff)
downloadlibgphoto2-32a389118276d263c951b3a2338386288ec79fd2.tar.gz
add includedir for *-uninstalled.pc
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10677 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--libgphoto2-uninstalled.pc.in9
-rw-r--r--libgphoto2_port/libgphoto2_port-uninstalled.pc.in7
2 files changed, 13 insertions, 3 deletions
diff --git a/libgphoto2-uninstalled.pc.in b/libgphoto2-uninstalled.pc.in
index d4b9c2424..b7921df37 100644
--- a/libgphoto2-uninstalled.pc.in
+++ b/libgphoto2-uninstalled.pc.in
@@ -1,13 +1,14 @@
# Note: As this file is sitting in ${top_builddir},
# ${top_builddir} ~= ${pcfiledir}
# and ${top_srcdir} ~= ${pcfiledir}/@srcdir@
-# Note: This referes to directory matches, not to string matches.
+# Note: This refers to directory matches, not to string matches.
# Note: ${pcfiledir} already is an absolute path name, so there is
-# no much sense prepending a ${pc_top_builddir} before it.
+# not much sense prepending a ${pc_top_builddir} before it.
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
+includedir=@includedir@
VERSION=@VERSION@
driverdir=@camlibdir@
@@ -16,5 +17,9 @@ Description: Library for easy access to digital cameras
URL: http://gphoto.org/proj/libgphoto2/
Version: ${VERSION}
Requires: libgphoto2_port >= 0.7.2, @REQUIREMENTS_FOR_LIBEXIF@
+# This is what works for gphoto-suite
Libs: ${pcfiledir}/libgphoto2/libgphoto2.la -lm
Cflags: -I${pcfiledir}/@srcdir@
+# This is what Sun wants (and does not work with gphoto-suite)
+# Libs: ${pc_top_builddir}/${pcfiledir}/libgphoto2/libgphoto2.la -lm
+# Cflags: -I${pc_top_builddir}/${pcfiledir}
diff --git a/libgphoto2_port/libgphoto2_port-uninstalled.pc.in b/libgphoto2_port/libgphoto2_port-uninstalled.pc.in
index dafca7b26..4ed2eb5e4 100644
--- a/libgphoto2_port/libgphoto2_port-uninstalled.pc.in
+++ b/libgphoto2_port/libgphoto2_port-uninstalled.pc.in
@@ -1,13 +1,14 @@
# Note: As this file is sitting in ${top_builddir},
# ${top_builddir} ~= ${pcfiledir}
# and ${top_srcdir} ~= ${pcfiledir}/@srcdir@
-# Note: This referes to directory matches, not to string matches.
+# Note: This refers to directory matches, not to string matches.
# Note: ${pcfiledir} already is an absolute path name, so there is
# no much sense prepending a ${pc_top_builddir} before it.
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
+includedir=@includedir@
VERSION=@VERSION@
driverdir=@camlibdir@
@@ -16,5 +17,9 @@ Description: Library for easy access to digital cameras
URL: http://gphoto.org/proj/libgphoto2/
Version: @VERSION@
Requires: libusb >= 0.1.11
+# This is what works for gphoto-suite
Libs: ${pcfiledir}/libgphoto2_port/libgphoto2_port.la -lm
Cflags: -I${pcfiledir}/@srcdir@
+# This is what Sun wants (and does not work with gphoto-suite)
+# Libs: ${pc_top_builddir}/${pcfiledir}/libgphoto2_port/libgphoto2_port.la -lm
+# Cflags: -I${pc_top_builddir}/${pcfiledir}