aboutsummaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-12-05 09:51:35 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2011-12-05 09:51:35 +0100
commit3132e1d023f23e175d0549d2af402b4843be46b2 (patch)
treef2a678c4afc93ecee4f7abd2d44ab7cf1292b068 /debian/patches
parent4c66f3d5c1fcad75d13e2dbdd7b04a352e3029e9 (diff)
downloadnx-libs-3132e1d023f23e175d0549d2af402b4843be46b2.tar.gz
nx-libs-3132e1d023f23e175d0549d2af402b4843be46b2.tar.bz2
nx-libs-3132e1d023f23e175d0549d2af402b4843be46b2.zip
Add patch 016_nx-x11-install.patch, to allow installation of nx-X11 from Makefile (via make install).
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/016_nx-x11-install.patch26
-rw-r--r--debian/patches/series1
2 files changed, 27 insertions, 0 deletions
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