[X2Go-Commits] [x2goserver] 02/02: x2goserver.spec: Also hand over %{_libdir} as $LIBDIR when executing make install.
git-admin at x2go.org
git-admin at x2go.org
Mon Jul 4 12:35:43 CEST 2016
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository x2goserver.
commit 9b5857e1abe70fa57452eaa2d27e5057170c3dd2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Mon Jul 4 12:35:30 2016 +0200
x2goserver.spec: Also hand over %{_libdir} as $LIBDIR when executing make install.
---
debian/changelog | 1 +
x2goserver.spec | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/debian/changelog b/debian/changelog
index 111fb6b..5d65e28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -126,6 +126,7 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low
+ 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.
+ + Also hand over %{_libdir} as $LIBDIR when executing make install.
[ Guangzhou Nianguan Electronics Technology Co.Ltd. ]
* New upstream version (4.1.0.0):
diff --git a/x2goserver.spec b/x2goserver.spec
index 35f5c9c..8e5dab0 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -489,7 +489,7 @@ make CFLAGS="%{optflags} -fPIC" %{?_smp_mflags} PERL_INSTALLDIRS=vendor PREFIX=%
%install
-make install DESTDIR=%{buildroot} PREFIX=%{_prefix}
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} LIBDIR=%{_libdir}
# 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