[X2Go-Commits] [nx-libs] 01/01: Merge branch 'bugfix/rpath' into 3.6.x-rpm-debug
git-admin at x2go.org
git-admin at x2go.org
Fri Dec 29 21:52:18 CET 2017
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch 3.6.x-rpm-debug
in repository nx-libs.
commit 86b45321d6f20646dba2103a1e3c7953f276a6eb
Merge: b21228f d23fc94
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Dec 29 21:46:38 2017 +0100
Merge branch 'bugfix/rpath' into 3.6.x-rpm-debug
nx-X11/config/cf/Imake.rules | 33 ++++++++++++++++++++++++++++++---
nx-X11/config/cf/Imake.tmpl | 1 +
nx-X11/config/cf/README | 1 +
nx-X11/config/cf/cross.def | 2 ++
nx-X11/config/cf/gnuLib.rules | 17 ++++++++++++++++-
nx-X11/config/cf/lnxLib.rules | 22 +++++++++++++++++++++-
nx-X11/programs/Xserver/Imakefile | 4 ++--
7 files changed, 73 insertions(+), 7 deletions(-)
diff --cc nx-X11/config/cf/Imake.rules
index f53a15b,b0d38fe..3cf429c
--- a/nx-X11/config/cf/Imake.rules
+++ b/nx-X11/config/cf/Imake.rules
@@@ -1586,6 -1602,17 +1602,17 @@@ install:: file @@
/*
+ * RelinkProgram - relinks an executable program in preparation of installation
+ */
+ #ifndef RelinkProgram
+ #define RelinkProgram(program,objects,libs,syslibs) @@\
+ ProgramRelinkName(server): program @@\
+ MoveToBakFile($@) @@\
- LinkInstallRule($@,$(SERVERLDOPTIONS),objects,libs $(LDLIBS) syslibs) @@\
++ LinkInstallRule($@,$(SERVERLDOPTIONS),objects,libs $(LDLIBS) syslibs)
+ #endif /* RelinkProgram */
+
+
+ /*
* InstallProgramWithFlags - generate rules to install an executable program
* using given install flags.
*/
--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git
More information about the x2go-commits
mailing list