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
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
|
Description: FHS adaptation for Debian packaging
From tarball, NX libraries and binaries are installed to
/usr/local/lib/nx.
Forwarded: not-needed
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Last-Update: 2012-12-31
--- 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 Concat4(ProjectRoot,/,LibDirName,/nx)
#ifndef AlternateUsrLibDir
#define AlternateUsrLibDir YES
#endif
#else
-#define UsrLibDir Concat3(/usr,/,LibDirName)
+#define UsrLibDir Concat4(/usr/local,/,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
--- a/nx-X11/config/cf/X11.rules
+++ b/nx-X11/config/cf/X11.rules
@@ -36,17 +36,17 @@
#endif
#if defined(X11ProjectRoot)
-# define XBinDir $(XPROJECTROOT)/bin
+# define XBinDir $(XPROJECTROOT)/lib/nx/bin
#elif defined(ProjectRoot)
-# define XBinDir $(PROJECTROOT)/bin
+# define XBinDir $(PROJECTROOT)/lib/nx/bin
#else
# define XBinDir $(BINDIR)
#endif
#ifdef X11ProjectRoot
-# define XUsrLibDirPath $(USRLIBDIR):$(XPROJECTROOT)/lib
+# define XUsrLibDirPath $(USRLIBDIR)/nx:$(XPROJECTROOT)
#else
-# define XUsrLibDirPath $(USRLIBDIR)
+# define XUsrLibDirPath $(USRLIBDIR)/nx
#endif
#ifdef UsrLibDirPath
# undef UsrLibDirPath
@@ -60,7 +60,7 @@
#if ImportX11
# define XLdPreLibs -L$(LIBSRC)
#elif defined(UseInstalledX11) && defined(X11ProjectRoot)
-# define XLdPreLibs -L$(XPROJECTROOT)/lib
+# define XLdPreLibs -L$(XPROJECTROOT)
#else
# define XLdPreLibs /**/
#endif
@@ -70,7 +70,7 @@
#define LdPreLibs LdPreLib XLdPreLibs
#ifdef X11ProjectRoot
-# define XLdPostLibs -L$(XPROJECTROOT)/lib
+# define XLdPostLibs -L$(XPROJECTROOT)
#else
# define XLdPostLibs /**/
#endif
@@ -86,7 +86,7 @@
# define TopXInclude -I$(TOP)/exports/include
#else
# ifdef X11ProjectRoot
-# define TopXInclude -I$(XPROJECTROOT)/include
+# define TopXInclude -I$(XPROJECTROOT)/../../include/nx
# else
# define TopXInclude /**/
# endif
@@ -98,7 +98,7 @@
#define TopIncludes TopInclude $(TOP_X_INCLUDES)
#if UseInstalledX11 && defined(X11ProjectRoot)
-# define X11BuildLibPath $(XPROJECTROOT)/lib
+# define X11BuildLibPath $(XPROJECTROOT)
#elif UseInstalledX11
# define X11BuildLibPath $(USRLIBDIR)
#elif ImportX11
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -1401,7 +1401,7 @@
#ifndef BinDir
#ifdef ProjectRoot
-#define BinDir Concat(ProjectRoot,/bin)
+#define BinDir Concat(ProjectRoot,/lib/nx/bin)
#else
#define BinDir /usr/bin/X11
#endif
@@ -1461,7 +1461,7 @@
#endif
#ifndef LibDir
# ifdef ProjectRoot
-# define LibDir Concat(ProjectRoot,/lib/X11)
+# define LibDir Concat(ProjectRoot,/lib/nx/X11)
# else
# define LibDir /usr/lib/X11
# endif
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -1054,7 +1054,7 @@
#if HaveLib64
# ifndef LibDirName
-# define LibDirName lib64
+# define LibDirName lib
# endif
# ifndef SystemUsrLibDir
# define SystemUsrLibDir /usr/lib64
--- a/nx-X11/config/cf/site.def
+++ b/nx-X11/config/cf/site.def
@@ -72,7 +72,7 @@
#ifdef AfterVendorCF
#ifndef ProjectRoot
-#define ProjectRoot /usr/local/lib/nx
+#define ProjectRoot /usr/local
#endif
/*
@@ -87,7 +87,7 @@
* ProjectRoot rather than in /etc/X11. See also HasVarDirectory,
* UseEtcX11 and UseSeparateConfDir.
*
-#define EtcX11Directory ProjectRoot/etc
+#define EtcX11Directory /etc/nx
*/
--- a/nxproxy/Makefile.in
+++ b/nxproxy/Makefile.in
@@ -33,7 +33,7 @@
srcdir = @srcdir@
prefix = @prefix@
-exec_prefix = @exec_prefix@
+exec_prefix = @exec_prefix@/lib/nx
bindir = @bindir@
man1dir = @mandir@/man1
VPATH = @srcdir@
|
