aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/016_nx-X11_install-location.debian.patch
blob: 78f569bfb12867cd4e496ba9fb40ddfd1aff567c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
Description: FHS adaptation for Debian packaging
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: 2017-02-08

--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -734,7 +734,7 @@
 #define AlternateUsrLibDir YES
 #endif
 #else
-#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11)
+#define UsrLibDir Concat4(/usr,/,LibDirName,/nx/X11)
 #ifndef AlternateUsrLibDir
 #define AlternateUsrLibDir NO
 #endif
@@ -752,7 +752,7 @@
 #define AlternateUsrDataDir YES
 #endif
 #else
-#define UsrDataDir Concat4(/usr/local,/,share,/nx)
+#define UsrDataDir Concat4(/usr,/,share,/nx)
 #ifndef AlternateUsrDataDir
 #define AlternateUsrDataDir NO
 #endif
--- a/nx-X11/config/cf/site.def
+++ b/nx-X11/config/cf/site.def
@@ -69,7 +69,7 @@
 #ifdef AfterVendorCF
 
 #ifndef ProjectRoot
-#define ProjectRoot /usr/local
+#define ProjectRoot /usr
 #endif
 
 /*