aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/016_nx-x11-install.patch26
-rw-r--r--debian/patches/series1
3 files changed, 29 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 30224b24f..98809c908 100644
--- a/debian/changelog
+++ b/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
diff --git a/debian/patches/016_nx-x11-install.patch b/debian/patches/016_nx-x11-install.patch
new file mode 100644
index 000000000..7a643c1ca
--- /dev/null
+++ b/debian/patches/016_nx-x11-install.patch
@@ -0,0 +1,26 @@
+--- 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
diff --git a/debian/patches/series b/debian/patches/series
index a6aa4921d..04a4fbc68 100644
--- a/debian/patches/series
+++ b/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