[X2Go-Commits] [x2goserver] 09/17: debian/rules: fix standalone make call by specifying PREFIX, NXLIBDIR and LIBDIR explicitly.

git-admin at x2go.org git-admin at x2go.org
Sun Jun 23 04:43:05 CEST 2019


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

x2go pushed a commit to branch master
in repository x2goserver.

commit 902e0882e9531af4bde2b2676f2117aed89898ac
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 22 06:20:58 2019 +0200

    debian/rules: fix standalone make call by specifying PREFIX, NXLIBDIR and LIBDIR explicitly.
---
 debian/changelog | 2 ++
 debian/rules     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 90e22e9..2933cd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -112,6 +112,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium
     + Install bin/x2goupdateoptionsstring.
   * debian/rules:
     + Export and pass down LIBDIR.
+    + Fix standalone make call by specifying PREFIX, NXLIBDIR and LIBDIR
+      explicitly.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.4):
diff --git a/debian/rules b/debian/rules
index 8b613be..a8e3700 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog ChangeLog; fi
-	$(MAKE) -f Makefile build-arch
+	$(MAKE) -f Makefile build-arch PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)'
 	PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' dh_auto_install
 
 override_dh_missing:

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git


More information about the x2go-commits mailing list