[X2Go-Commits] [x2goserver] 01/01: x2goserver.spec: Hand over %{_libdir} as $LIBDIR to x2goserver's Makefiles. Required for x2goagent symlink to be properly installed into the same folder where the nxagent executable gets installed.

[git-admin at x2go.org]

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

x2go pushed a commit to branch master
in repository x2goserver.

commit 2b503aa9615884b90169d62b76331f0f167bab03
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Jul 4 12:01:31 2016 +0200

    x2goserver.spec: Hand over %{_libdir} as $LIBDIR to x2goserver's Makefiles. Required for x2goagent symlink to be properly installed into the same folder where the nxagent executable gets installed.
---
 debian/changelog |    7 +++++--
 x2goserver.spec  |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 699d104..9abbc2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low
+x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low
 
   [ Mike Gabriel ]
   * Bump development upstream version to 4.1.0.0.
@@ -123,6 +123,9 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low
     + Require Perl(Switch) (bin:package x2goserver).
     + Don't fail in %post during X2Go session DB creation.
     + Fix call of x2godbadmin --updatedb during package upgrade.
+    + Hand over %{_libdir} as $LIBDIR to x2goserver's Makefiles. Required
+      for x2goagent symlink to be properly installed into the same folder
+      where the nxagent executable gets installed.
 
   [ Guangzhou Nianguan Electronics Technology Co.Ltd. ]
   * New upstream version (4.1.0.0):
@@ -211,7 +214,7 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low
   * debian/x2goserver-x2goagent.install:
     - Re-add etc/rgb file.
 
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Fri, 09 May 2014 13:06:24 +0200
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Mon, 04 Jul 2016 12:00:24 +0200
 
 x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
 
diff --git a/x2goserver.spec b/x2goserver.spec
index d941841..35f5c9c 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -485,7 +485,7 @@ sed -i -e 's/-o root -g root//' */Makefile
 
 %build
 export PATH=%{_qt4_bindir}:$PATH
-make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix}
+make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} LIBDIR=%{_libdir}
 
 
 %install

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