From 42d639f30d6701d49644b16b9233f5f5cc1a2631 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Fri, 18 Nov 2016 23:41:30 +0000 Subject: [PATCH 1/2] Add pkgconfig/.gitignore --- pkgconfig/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 pkgconfig/.gitignore diff --git a/pkgconfig/.gitignore b/pkgconfig/.gitignore new file mode 100644 index 00000000..905f6549 --- /dev/null +++ b/pkgconfig/.gitignore @@ -0,0 +1,2 @@ +xrdp.pc +xrdp-uninstalled.pc From 5afc5bd8b35dc0f322082949f425cbb90cb2478f Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Fri, 18 Nov 2016 23:41:30 +0000 Subject: [PATCH 2/2] 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. --- pkgconfig/xrdp-uninstalled.pc.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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