summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Roskin <plroskin@gmail.com>2016-11-18 23:41:30 +0000
committerPavel Roskin <plroskin@gmail.com>2016-11-18 23:42:26 +0000
commit5afc5bd8b35dc0f322082949f425cbb90cb2478f (patch)
tree86f5a7cc6f85d7f9bc9bce1b71d597281813bf84
parent42d639f30d6701d49644b16b9233f5f5cc1a2631 (diff)
downloadxrdp-proprietary-5afc5bd8b35dc0f322082949f425cbb90cb2478f.tar.gz
xrdp-proprietary-5afc5bd8b35dc0f322082949f425cbb90cb2478f.zip
Fix include path in xrdp-uninstalled.pc.in
${pcfiledir} refers to the directory of the package-config file. For an xrdp build in the source tree, the correct include location would be ${pcfiledir}/../common, not ${pcfiledir}/common For xrdp build outside the source tree, there is no way to find the source tree without help from the configure script. While the '${pc_top_builddir}/${pcfiledir}' pattern is still widespread, many packages (e.g. gstreamer) are switching to @abs_top_srcdir@ and @abs_top_builddir@, which are always absolute and have knowledge about the source tree location from the configure script. Use @abs_top_srcdir@ for the headers. @abs_top_builddir@ is not needed, as xrdp produces no externally consumable libraries or generated headers.
-rw-r--r--pkgconfig/xrdp-uninstalled.pc.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgconfig/xrdp-uninstalled.pc.in b/pkgconfig/xrdp-uninstalled.pc.in
index ae725d9a..aa130fd3 100644
--- a/pkgconfig/xrdp-uninstalled.pc.in
+++ b/pkgconfig/xrdp-uninstalled.pc.in
@@ -1,4 +1,5 @@
-includedir=${pc_top_builddir}/${pcfiledir}/common
+abs_top_srcdir=@abs_top_srcdir@
+includedir=${abs_top_srcdir}/common
Name: xrdp
Description: An open source Remote Desktop Protocol (RDP) server