[X2Go-Commits] [x2goserver] 01/01: x2goserver/Makefile: fix shell quoting issue with newly exported ${DESTDIR} variable.
git-admin at x2go.org
git-admin at x2go.org
Mon Jun 24 09:28:21 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 917883085d2eaf30170e1f020ae42a8afc0b93c5
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Jun 24 09:27:57 2019 +0200
x2goserver/Makefile: fix shell quoting issue with newly exported ${DESTDIR} variable.
---
debian/changelog | 2 ++
x2goserver/Makefile | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e38b80f..c947960 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -130,6 +130,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium
script, which is not what we want to have. Correctly doing that with
multiple runs would require the usage of temporary files, which is
needlessly complicated in this context.
+ - x2goserver/Makefile: fix shell quoting issue with newly exported
+ ${DESTDIR} variable.
* debian/control:
+ Build-depend upon lsb-release for distro version detection.
* debian/x2goserver.manpages:
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index 26781dd..746e83e 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -111,7 +111,7 @@ install: build install_scripts install_config install_man install_version
install_scripts:
for dir in 'bin' 'sbin' 'lib' 'share/x2gofeature.d'; do \
$$(: "Create (and save) destination directory."); \
- dest='$${DESTDIR}'; \
+ dest="$${DESTDIR}"; \
case "$${dir}" in \
('bin') dest="$${dest}$${BINDIR}/";; \
('sbin') dest="$${dest}$${SBINDIR}/";; \
@@ -165,7 +165,7 @@ uninstall: uninstall_scripts uninstall_config uninstall_man uninstall_version
uninstall_scripts:
for dir in 'bin' 'sbin' 'lib' 'share/x2gofeature.d'; do \
$$(: "Create (and save) destination directory."); \
- dest='$${DESTDIR}'; \
+ dest="$${DESTDIR}"; \
case "$${dir}" in \
('bin') dest="$${dest}$${BINDIR}/";; \
('sbin') dest="$${dest}$${SBINDIR}/";; \
--
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