[X2Go-Commits] [x2goserver] 01/01: debian/rules: fix quoting.

[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 9da7a4d6d5d1be39407807c653f9d9bfa62b5823
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Jun 23 07:30:56 2019 +0200

    debian/rules: fix quoting.
    
    Since make does not interpret single or double quotes, each string
    should only be quoted once (so that the shell can parse the quoted
    result).
    
    Quote the values in the variable directly and try not to "double-quote"
    the resulting string.
---
 debian/changelog |  4 ++++
 debian/rules     | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5668709..27c8e34 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -139,6 +139,10 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium
     + Export and pass down LIBDIR.
     + Fix standalone make call by specifying PREFIX, NXLIBDIR and LIBDIR
       explicitly.
+    + Fix quoting. Since make does not interpret single or double quotes, each
+      string should only be quoted once (so that the shell can parse the
+      quoted result). Quote the values in the variable directly and try not to
+      "double-quote" the resulting string.
 
   [ Oleksandr Shneyder ]
   * New upstream version (4.1.0.4):
diff --git a/debian/rules b/debian/rules
index a8e3700..aaa4f1d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,23 +28,23 @@ ifeq ($(shell /bin/bash -c '(( $(RELEASE_VER_MAJOR) >= 16 )) && echo yes'),yes)
 endif
 endif
 
-export NXLIBDIR="/usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/nx"
-export LIBDIR="/usr/lib/x2go"
+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)' LIBDIR='$(LIBDIR)' dh ${@} --with=systemd || PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' 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)' LIBDIR='$(LIBDIR)' 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)' LIBDIR='$(LIBDIR)'
-	PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' dh_auto_install
+	$(MAKE) -f Makefile build-arch PREFIX='/usr' NXLIBDIR=$(NXLIBDIR) LIBDIR=$(LIBDIR)
+	PREFIX='/usr' NXLIBDIR=$(NXLIBDIR) LIBDIR=$(LIBDIR) dh_auto_install
 
 override_dh_missing:
 	dh_missing --fail-missing
@@ -56,7 +56,7 @@ override_dh_auto_clean:
 	rm -f ChangeLog.gitlog
 	rm -f MYMETA.yml
 	rm -f Makefile.perl.old
-	PREFIX='/usr' NXLIBDIR='$(NXLIBDIR)' LIBDIR='$(LIBDIR)' 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