[X2Go-Commits] [x2goserver] 05/10: x2goserver.spec: fix NXLIBDIR path to use %{_libdir} directly.

git-admin at x2go.org git-admin at x2go.org
Mon Mar 6 09:47:53 CET 2017


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

x2go pushed a commit to branch master
in repository x2goserver.

commit ad4e21b5c0a00da1fe15452caebc0b31489fa971
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Thu Jan 5 15:39:50 2017 -0700

    x2goserver.spec: fix NXLIBDIR path to use %{_libdir} directly.
---
 debian/changelog | 2 ++
 x2goserver.spec  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e09a570..b421275 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -156,6 +156,8 @@ x2goserver (4.1.0.0-0x2go1.2) UNRELEASED; urgency=low
   [ Orion Poplawski ]
   * New upstream version (4.1.0.0):
     - Use new script x2gopath in Perl::API. (Fixes: #86).
+  * x2goserver.spec:
+    - Fix NXLIBDIR path to use %{_libdir} directly.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.0):
diff --git a/x2goserver.spec b/x2goserver.spec
index ea1b901..35c7b56 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -500,11 +500,11 @@ 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} NXLIBDIR=%{_prefix}%{_lib}/nx
+make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx
 
 
 %install
-make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_prefix}/%{_lib}/nx
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} NXLIBDIR=%{_libdir}/nx
 # We currently need to disable the broken symlinks check on OpenSuSE, as long
 # as we can't pull in nx-libs 3.5.99 or higher. Once we can add it as a BuildRequires,
 # this env var can and should be removed again.

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


More information about the x2go-commits mailing list