diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2017-02-10 00:47:32 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2017-02-10 00:47:32 +0100 |
| commit | 0a7df07702c6f56b708a22c666077a3b90c7542c (patch) | |
| tree | 760707ab65b4e2ab39ac744d740af03f854dd9b0 /nx-X11 | |
| parent | 0a314adfa63669155299c77e479ed68c349643bd (diff) | |
| parent | 99c130f153b88fb9c779b0fd1f91d78cc4e75d01 (diff) | |
| download | nx-libs-0a7df07702c6f56b708a22c666077a3b90c7542c.tar.gz nx-libs-0a7df07702c6f56b708a22c666077a3b90c7542c.tar.bz2 nx-libs-0a7df07702c6f56b708a22c666077a3b90c7542c.zip | |
Merge branch 'sunweaver-pr/use-rpath-for-nxagent' into 3.6.x
Attributes GH PR #313: https://github.com/ArcticaProject/nx-libs/pull/313
Diffstat (limited to 'nx-X11')
| -rw-r--r-- | nx-X11/config/cf/Imake.tmpl | 4 | ||||
| -rw-r--r-- | nx-X11/config/cf/X11.rules | 4 | ||||
| -rw-r--r-- | nx-X11/config/cf/lnxLib.rules | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/config/cf/Imake.tmpl b/nx-X11/config/cf/Imake.tmpl index 93b659a0d..ba97b3b4c 100644 --- a/nx-X11/config/cf/Imake.tmpl +++ b/nx-X11/config/cf/Imake.tmpl @@ -723,12 +723,12 @@ TCLIBDIR = TclLibDir #ifndef UsrLibDir #ifdef ProjectRoot -#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx) +#define UsrLibDir Concat4(ProjectRoot,/,LibDirName,/nx/X11) #ifndef AlternateUsrLibDir #define AlternateUsrLibDir YES #endif #else -#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx) +#define UsrLibDir Concat4(/usr/local,/,LibDirName,/nx/X11) #ifndef AlternateUsrLibDir #define AlternateUsrLibDir NO #endif diff --git a/nx-X11/config/cf/X11.rules b/nx-X11/config/cf/X11.rules index 0f6a67ed4..af3473c3a 100644 --- a/nx-X11/config/cf/X11.rules +++ b/nx-X11/config/cf/X11.rules @@ -39,9 +39,9 @@ #endif #ifdef X11ProjectRoot -# define XUsrLibDirPath $(USRLIBDIR)/nx:$(XPROJECTROOT) +# define XUsrLibDirPath $(USRLIBDIR):$(XPROJECTROOT) #else -# define XUsrLibDirPath $(USRLIBDIR)/nx +# define XUsrLibDirPath $(USRLIBDIR) #endif #ifdef UsrLibDirPath # undef UsrLibDirPath diff --git a/nx-X11/config/cf/lnxLib.rules b/nx-X11/config/cf/lnxLib.rules index 166e896f1..e415db8f1 100644 --- a/nx-X11/config/cf/lnxLib.rules +++ b/nx-X11/config/cf/lnxLib.rules @@ -9,7 +9,7 @@ #endif #ifndef UseRpath -#define UseRpath NO +#define UseRpath YES #endif #if UseElfFormat |