Add patch 016_nx-x11-install.patch, to allow installation of nx-X11 from…

debian/changelog

@@ -29,5 +29,7 @@ nx-libs (2:3.5.0-0~x2go1) UNRELEASED; urgency=low
   * Add patch: 015_nxproxy-makefile-uninstall.patch.
   * Add install/uninstall stanza to main Makefile (via patch
     001_add-main-makefile.patch).
+  * Add patch 016_nx-x11-install.patch, to allow installation of nx-X11 from
+    Makefile (via make install).
 
  -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Fri, 14 Oct 2011 03:01:39 +0200

debian/patches/016_nx-x11-install.patch

+--- a/nx-X11/config/cf/Imake.tmpl
++++ b/nx-X11/config/cf/Imake.tmpl
+@@ -820,12 +820,12 @@
+ 
+ #ifndef UsrLibDir
+ #ifdef ProjectRoot
+-#define UsrLibDir Concat3(ProjectRoot,/,LibDirName)
++#define UsrLibDir Concat5(ProjectRoot,/,LibDirName,/,nx)
+ #ifndef AlternateUsrLibDir
+ #define AlternateUsrLibDir YES
+ #endif
+ #else
+-#define UsrLibDir Concat3(/usr,/,LibDirName)
++#define UsrLibDir Concat5(/usr,/,LibDirName,/,nx)
+ #ifndef AlternateUsrLibDir
+ #define AlternateUsrLibDir NO
+ #endif
+@@ -863,7 +863,7 @@
+ #endif
+ #ifndef IncRoot
+ #ifdef ProjectRoot
+-#define IncRoot Concat(ProjectRoot,/include)
++#define IncRoot Concat(ProjectRoot,/include/nx)
+ #ifndef AlternateIncRoot
+ #define AlternateIncRoot YES
+ #endif

debian/patches/series

@@ -13,3 +13,4 @@
 013_nxcompext-makefile-uninstall.patch
 014_nxcompshad-makefile-uninstall.patch
 015_nxproxy-makefile-uninstall.patch
+016_nx-x11-install.patch