aboutsummaryrefslogtreecommitdiff
path: root/debian/patches/016_nx-X11_install-location.debian.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches/016_nx-X11_install-location.debian.patch')
-rw-r--r--debian/patches/016_nx-X11_install-location.debian.patch45
1 files changed, 0 insertions, 45 deletions
diff --git a/debian/patches/016_nx-X11_install-location.debian.patch b/debian/patches/016_nx-X11_install-location.debian.patch
deleted file mode 100644
index a2a0f9f45..000000000
--- a/debian/patches/016_nx-X11_install-location.debian.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-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
-@@ -736,7 +736,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
-@@ -754,7 +754,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
-
- /*