[debian-edu-commits] debian-edu/pkg-team/ 97/159: fix rpath in subrepo

[Dominik George]

This is an automated email from the git hooks/post-receive script.

natureshadow-guest pushed a commit to branch master
in repository xrdp.

commit 64af0e62a7f328b859159857ab7bd7fc4c72b36f
Author: mirabilos <tg at mirbsd.org>
Date:   Wed Aug 26 22:16:02 2015 +0200

    fix rpath in subrepo
---
 patches/misc-fixes.diff | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/patches/misc-fixes.diff b/patches/misc-fixes.diff
index 2b373e8..9ce301c 100644
--- a/patches/misc-fixes.diff
+++ b/patches/misc-fixes.diff
@@ -82,6 +82,17 @@
  {
      LOG(0, ("rail_desktop_resize:"));
      return 0;
+--- a/xorgxrdp/configure.ac
++++ b/xorgxrdp/configure.ac
+@@ -9,7 +9,7 @@ AC_PROG_CC
+ AC_C_CONST
+ AC_PROG_LIBTOOL
+ 
+-AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE"])
++AM_CONDITIONAL(GOT_PREFIX, test "x${prefix}" != "xNONE" && test "x${prefix}" != "x/usr"])
+ 
+ AC_CHECK_HEADER([xorg/xorg-server.h], [],
+   [AC_MSG_ERROR([please install xserver-xorg-dev or xorg-x11-server-sdk])])
 --- a/xorgxrdp/xrdpdev/xrdpdev.c
 +++ b/xorgxrdp/xrdpdev/xrdpdev.c
 @@ -138,7 +138,7 @@ rdpPreInit(ScrnInfoPtr pScrn, int flags)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/xrdp.git