Skip to content

N
nx-libs
Commit 9b72eeaa authored by Mike Gabriel's avatar Mike Gabriel
Browse files
Options

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.
parent 519bcac9
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 171 deletions
debian/patches/016_nx-X11_install-location.full.patch deleted 100644 → 0
View file @ 519bcac9
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@
debian/patches/series
View file @ 9b72eeaa
016_nx-X11_install-location.full.patch
024_fix-make-clean.full.patch 024_fix-make-clean.full.patch
024_fix-make-clean.full+lite.patch 024_fix-make-clean.full+lite.patch
025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
......
nx-X11/config/cf/Imake.tmpl
View file @ 9b72eeaa
...@@ -820,12 +820,12 @@ TCLIBDIR = TclLibDir ...@@ -820,12 +820,12 @@ TCLIBDIR = TclLibDir
#ifndef UsrLibDir #ifndef UsrLibDir
#ifdef ProjectRoot #ifdef ProjectRoot
#define UsrLibDir Concat3(ProjectRoot,/,LibDirName) #define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx)
#ifndef AlternateUsrLibDir #ifndef AlternateUsrLibDir
#define AlternateUsrLibDir YES #define AlternateUsrLibDir YES
#endif #endif
#else #else
#define UsrLibDir Concat3(/usr,/,LibDirName) #define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx)
#ifndef AlternateUsrLibDir #ifndef AlternateUsrLibDir
#define AlternateUsrLibDir NO #define AlternateUsrLibDir NO
#endif #endif
...@@ -863,7 +863,7 @@ TCLIBDIR = TclLibDir ...@@ -863,7 +863,7 @@ TCLIBDIR = TclLibDir
#endif #endif
#ifndef IncRoot #ifndef IncRoot
#ifdef ProjectRoot #ifdef ProjectRoot
#define IncRoot Concat(ProjectRoot,/include) #define IncRoot Concat(ProjectRoot,/include/nx)
#ifndef AlternateIncRoot #ifndef AlternateIncRoot
#define AlternateIncRoot YES #define AlternateIncRoot YES
#endif #endif
......
nx-X11/config/cf/X11.rules
View file @ 9b72eeaa
...@@ -36,17 +36,17 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ ...@@ -36,17 +36,17 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
#endif #endif
#if defined(X11ProjectRoot) #if defined(X11ProjectRoot)
# define XBinDir $(XPROJECTROOT)/bin # define XBinDir $(XPROJECTROOT)/lib/nx/bin
#elif defined(ProjectRoot) #elif defined(ProjectRoot)
# define XBinDir $(PROJECTROOT)/bin # define XBinDir $(PROJECTROOT)/lib/nx/bin
#else #else
# define XBinDir $(BINDIR) # define XBinDir $(BINDIR)
#endif #endif
#ifdef X11ProjectRoot #ifdef X11ProjectRoot
# define XUsrLibDirPath $(USRLIBDIR):$(XPROJECTROOT)/lib # define XUsrLibDirPath $(USRLIBDIR)/nx:$(XPROJECTROOT)
#else #else
# define XUsrLibDirPath $(USRLIBDIR) # define XUsrLibDirPath $(USRLIBDIR)/nx
#endif #endif
#ifdef UsrLibDirPath #ifdef UsrLibDirPath
# undef 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 $ ...@@ -60,7 +60,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $
#if ImportX11 #if ImportX11
# define XLdPreLibs -L$(LIBSRC) # define XLdPreLibs -L$(LIBSRC)
#elif defined(UseInstalledX11) && defined(X11ProjectRoot) #elif defined(UseInstalledX11) && defined(X11ProjectRoot)
# define XLdPreLibs -L$(XPROJECTROOT)/lib # define XLdPreLibs -L$(XPROJECTROOT)
#else #else
# define XLdPreLibs /**/ # define XLdPreLibs /**/
#endif #endif
...@@ -70,7 +70,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ ...@@ -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 #define LdPreLibs LdPreLib XLdPreLibs
#ifdef X11ProjectRoot #ifdef X11ProjectRoot
# define XLdPostLibs -L$(XPROJECTROOT)/lib # define XLdPostLibs -L$(XPROJECTROOT)
#else #else
# define XLdPostLibs /**/ # define XLdPostLibs /**/
#endif #endif
...@@ -86,7 +86,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ ...@@ -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 # define TopXInclude -I$(TOP)/exports/include
#else #else
# ifdef X11ProjectRoot # ifdef X11ProjectRoot
# define TopXInclude -I$(XPROJECTROOT)/include # define TopXInclude -I$(XPROJECTROOT)/../../include/nx
# else # else
# define TopXInclude /**/ # define TopXInclude /**/
# endif # endif
...@@ -98,7 +98,7 @@ XCOMM $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ ...@@ -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) #define TopIncludes TopInclude $(TOP_X_INCLUDES)
#if UseInstalledX11 && defined(X11ProjectRoot) #if UseInstalledX11 && defined(X11ProjectRoot)
# define X11BuildLibPath $(XPROJECTROOT)/lib # define X11BuildLibPath $(XPROJECTROOT)
#elif UseInstalledX11 #elif UseInstalledX11
# define X11BuildLibPath $(USRLIBDIR) # define X11BuildLibPath $(USRLIBDIR)
#elif ImportX11 #elif ImportX11
......
nx-X11/config/cf/X11.tmpl
View file @ 9b72eeaa
...@@ -1401,7 +1401,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN ...@@ -1401,7 +1401,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#ifndef BinDir #ifndef BinDir
#ifdef ProjectRoot #ifdef ProjectRoot
#define BinDir Concat(ProjectRoot,/bin) #define BinDir Concat(ProjectRoot,/lib/nx/bin)
#else #else
#define BinDir /usr/bin/X11 #define BinDir /usr/bin/X11
#endif #endif
...@@ -1461,7 +1461,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN ...@@ -1461,7 +1461,7 @@ FCHOWN_DEFINES = -DHAS_FCHOWN
#endif #endif
#ifndef LibDir #ifndef LibDir
# ifdef ProjectRoot # ifdef ProjectRoot
# define LibDir Concat(ProjectRoot,/lib/X11) # define LibDir Concat(ProjectRoot,/lib/nx/X11)
# else # else
# define LibDir /usr/lib/X11 # define LibDir /usr/lib/X11
# endif # endif
......
nx-X11/config/cf/linux.cf
View file @ 9b72eeaa
...@@ -1054,7 +1054,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class ...@@ -1054,7 +1054,7 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class
#if HaveLib64 #if HaveLib64
# ifndef LibDirName # ifndef LibDirName
# define LibDirName lib64 # define LibDirName lib
# endif # endif
# ifndef SystemUsrLibDir # ifndef SystemUsrLibDir
# define SystemUsrLibDir /usr/lib64 # define SystemUsrLibDir /usr/lib64
......
nx-X11/config/cf/site.def
View file @ 9b72eeaa
...@@ -72,7 +72,7 @@ XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex ...@@ -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 #ifdef AfterVendorCF
#ifndef ProjectRoot #ifndef ProjectRoot
#define ProjectRoot /usr/local/lib/nx #define ProjectRoot /usr/local
#endif #endif
/* /*
...@@ -87,7 +87,7 @@ XCOMM site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Ex ...@@ -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, * ProjectRoot rather than in /etc/X11. See also HasVarDirectory,
* UseEtcX11 and UseSeparateConfDir. * UseEtcX11 and UseSeparateConfDir.
* *
#define EtcX11Directory ProjectRoot/etc #define EtcX11Directory /etc/nx
*/ */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment