[X2Go-Commits] [nx-libs] 15/29: 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.

git-admin at x2go.org git-admin at x2go.org
Tue Feb 10 05:21:43 CET 2015 

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 9b72eeaa21ada21b117433b05c745b656b42963a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Feb 9 15:12:11 2015 +0100

    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.
---
 .../patches/016_nx-X11_install-location.full.patch |  154 --------------------
 debian/patches/series                              |    1 -
 nx-X11/config/cf/Imake.tmpl                        |    6 +-
 nx-X11/config/cf/X11.rules                         |   16 +-
 nx-X11/config/cf/X11.tmpl                          |    4 +-
 nx-X11/config/cf/linux.cf                          |    2 +-
 nx-X11/config/cf/site.def                          |    4 +-
 7 files changed, 16 insertions(+), 171 deletions(-)

diff --git a/debian/patches/016_nx-X11_install-location.full.patch b/debian/patches/016_nx-X11_install-location.full.patch
deleted file mode 100644
index 6571aea..0000000
--- a/debian/patches/016_nx-X11_install-location.full.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-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 at 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@
diff --git a/debian/patches/series b/debian/patches/series
index f3678f4..70c573c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-016_nx-X11_install-location.full.patch
 024_fix-make-clean.full.patch
 024_fix-make-clean.full+lite.patch
 025_nxcomp-fix-ftbfs-against-jpeg9a.full+lite.patch
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl
index 2681108..6ca974f 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 8a176c7..51ae38c 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 12967d1..c1c92ca 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 98981d7..25d2547 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 c242f0e..071116f 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
  */
 
 

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git

More information about the x2go-commits mailing list