aboutsummaryrefslogtreecommitdiff
path: root/nx-X11
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-09 15:12:11 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-09 15:14:39 +0100
commit9b72eeaa21ada21b117433b05c745b656b42963a (patch)
tree433ace3b0d8542afb5b7faa711f1b7c6a0e7393b /nx-X11
parent519bcac93c8d8125de8b73641af3ee7388659984 (diff)
downloadnx-libs-9b72eeaa21ada21b117433b05c745b656b42963a.tar.gz
nx-libs-9b72eeaa21ada21b117433b05c745b656b42963a.tar.bz2
nx-libs-9b72eeaa21ada21b117433b05c745b656b42963a.zip
FHS adaptation for Debian packaging (016_nx-X11_install-location.full.patch).
From tarball, NX libraries and binaries are installed to /usr/local/lib/nx. . FIXME: The paths in this patch get superceded by current build logic in nx-libs.spec and debian/rules. This should be merged into the NX build logic finally.
Diffstat (limited to 'nx-X11')
-rw-r--r--nx-X11/config/cf/Imake.tmpl6
-rw-r--r--nx-X11/config/cf/X11.rules16
-rw-r--r--nx-X11/config/cf/X11.tmpl4
-rw-r--r--nx-X11/config/cf/linux.cf2
-rw-r--r--nx-X11/config/cf/site.def4
5 files changed, 16 insertions, 16 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 26811085d..6ca974f57 100644
--- a/nx-X11/config/cf/Imake.tmpl
+++ b/nx-X11/config/cf/Imake.tmpl
@@ -820,12 +820,12 @@ TCLIBDIR = TclLibDir
#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 @@ TCLIBDIR = TclLibDir
#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/nx-X11/config/cf/X11.rules b/nx-X11/config/cf/X11.rules
index 8a176c7a3..51ae38c7d 100644
--- a/nx-X11/config/cf/X11.rules
+++ b/nx-X11/config/cf/X11.rules
@@ -36,17 +36,17 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
#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 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
#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 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
#define LdPreLibs LdPreLib XLdPreLibs
#ifdef X11ProjectRoot
-# define XLdPostLibs -L$(XPROJECTROOT)/lib
+# define XLdPostLibs -L$(XPROJECTROOT)
#else
# define XLdPostLibs /**/
#endif
@@ -86,7 +86,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
# 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 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
#define TopIncludes TopInclude $(TOP_X_INCLUDES)
#if UseInstalledX11 && defined(X11ProjectRoot)
-# define X11BuildLibPath $(XPROJECTROOT)/lib
+# define X11BuildLibPath $(XPROJECTROOT)
#elif UseInstalledX11
# define X11BuildLibPath $(USRLIBDIR)
#elif ImportX11
diff --git a/nx-X11/config/cf/X11.tmpl b/nx-X11/config/cf/X11.tmpl
index 12967d1d5..c1c92ca10 100644
--- a/nx-X11/config/cf/X11.tmpl
+++ b/nx-X11/config/cf/X11.tmpl
@@ -1401,7 +1401,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#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 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#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
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index 98981d7a7..25d254787 100644
--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -1054,7 +1054,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
#if HaveLib64
# ifndef LibDirName
-# define LibDirName lib64
+# define LibDirName lib
# endif
# ifndef SystemUsrLibDir
# define SystemUsrLibDir /usr/lib64
diff --git a/nx-X11/config/cf/site.def b/nx-X11/config/cf/site.def
index c242f0ef9..071116f3f 100644
--- a/nx-X11/config/cf/site.def
+++ b/nx-X11/config/cf/site.def
@@ -72,7 +72,7 @@ XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex
#ifdef AfterVendorCF
#ifndef ProjectRoot
-#define ProjectRoot /usr/local/lib/nx
+#define ProjectRoot /usr/local
#endif
/*
@@ -87,7 +87,7 @@ XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex
* ProjectRoot rather than in /etc/X11. See also HasVarDirectory,
* UseEtcX11 and UseSeparateConfDir.
*
-#define EtcX11Directory ProjectRoot/etc
+#define EtcX11Directory /etc/nx
*/