[X2Go-Commits] [x2goserver] 08/17: debian/rules: export and pass down LIBDIR.

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 e5f19e1b3cca55584958962a78b42ca788f4299a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 22 06:19:43 2019 +0200

    debian/rules: export and pass down LIBDIR.
---
 debian/changelog | 2 ++
 debian/rules     | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4877796..90e22e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -110,6 +110,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium
       sed.
   * debian/x2goserver.install:
     + Install bin/x2goupdateoptionsstring.
+  * debian/rules:
+    + Export and pass down LIBDIR.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.4):
diff --git a/debian/rules b/debian/rules
index c9527bf..8b613be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,21 +29,22 @@ endif
 endif
 
 export NXLIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/nx"
+export LIBDIR="/usr/lib/x2go"
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
 
 %:
-	PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh ${@} --with=systemd || PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh ${@}
+	PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' dh ${@} --with=systemd || PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' dh ${@}
 
 override_dh_auto_build:
-	PREFIX=/usr NXLIBDIR=$(NXLIBDIR) PERL_INSTALLDIRS=vendor dh_auto_build
+	PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' PERL_INSTALLDIRS=vendor dh_auto_build
 
 override_dh_auto_install:
 	if [ -f ChangeLog.gitlog ]; then cp ChangeLog.gitlog ChangeLog; fi
 	$(MAKE) -f Makefile build-arch
-	PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh_auto_install
+	PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' dh_auto_install
 
 override_dh_missing:
 	dh_missing --fail-missing
@@ -55,7 +56,7 @@ override_dh_auto_clean:
 	rm -f ChangeLog.gitlog
 	rm -f MYMETA.yml
 	rm -f Makefile.perl.old
-	PREFIX=/usr NXLIBDIR=$(NXLIBDIR) dh_auto_clean
+	PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' dh_auto_clean
 	rm -f Makefile.perl
 
 override_dh_gencontrol:

--
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