aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/016_nx-X11_install-location.debian.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/016_nx-X11_install-location.debian.patch')
-rw-r--r--debian/patches/016_nx-X11_install-location.debian.patch24
1 files changed, 16 insertions, 8 deletions
diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch
index ee5bb66cf..c758a3cfe 100644
--- a/debian/patches/016_nx-X11_install-location.debian.patch
+++ b/debian/patches/016_nx-X11_install-location.debian.patch
@@ -1,21 +1,29 @@
Description: FHS adaptation for Debian packaging
- On Debian, NX libraries and binaries are installed to
- /usr/lib/nx.
+Abstract:
+ On Debian, binaries are installed to /usr/<lib>/nx.
+ .
+ Also, a fake-libX11 library symlink is placed into
+ /usr/<lib>/nx/X11.
+ .
+ The given paths will be overridden by the Debian packaging
+ and modified into multi-arch paths.
+
Forwarded: not-needed
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-Last-Update: 2012-12-31
+Last-Update: 2017-02-08
+
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
-@@ -749,7 +749,7 @@
+@@ -730,7 +730,7 @@
#define AlternateUsrLibDir YES
#endif
#else
--#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx)
-+#define UsrLibDir Concat4(/usr,/,LibDirName,/nx)
+-#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11)
++#define UsrLibDir Concat4(/usr,/,LibDirName,/nx/X11)
#ifndef AlternateUsrLibDir
#define AlternateUsrLibDir NO
#endif
-@@ -767,7 +767,7 @@
+@@ -748,7 +748,7 @@
#define AlternateUsrDataDir YES
#endif
#else
@@ -26,7 +34,7 @@ Last-Update: 2012-12-31
#endif
--- a/nx-X11/config/cf/site.def
+++ b/nx-X11/config/cf/site.def
-@@ -72,7 +72,7 @@
+@@ -69,7 +69,7 @@
#ifdef AfterVendorCF
#ifndef ProjectRoot