This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit fe13d0cee034fe084825ebe6cc8657665c7f5615 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 23 06:26:40 2019 +0200 x2goserver/Makefile: fix "inline" commenting syntax. Wrapping everything as one string leads to the shell interpreting it as a verbatim command, which will fail execution. Dropping quotes SHOULD™ work, but doesn't, because the outer shell is treating as a comment for itself - leading to it ignoring everything else on that line, including the closing parenthesis. Escaping the hash char only leads to the initial situation with it being parsed as a comment. Backticks would work, but are ugly. Hence, just use the colon pseudo-command. --- debian/changelog | 8 ++++++++ x2goserver/Makefile | 16 ++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 340cab6..1413bc7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -112,6 +112,14 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - x2goserver/bin/x2gopath.in: use [] instead of test, for consistency. - x2goserver/Makefile: remove indirections, not needed any longer and leading to build failures now. + - x2goserver/Makefile: fix "inline" commenting syntax. Wrapping everything + as one string leads to the shell interpreting it as a verbatim command, + which will fail execution. Dropping quotes SHOULD™ work, but doesn't, + because the outer shell is treating as a comment for itself - leading to + it ignoring everything else on that line, including the closing + parenthesis. Escaping the hash char only leads to the initial situation + with it being parsed as a comment. Backticks would work, but are ugly. + Hence, just use the colon pseudo-command. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/Makefile b/x2goserver/Makefile index c3bbc78..a806c61 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -43,10 +43,10 @@ build-indep: build_pod2man build_man2html for gen_file in "$${dir}/"*; do \ file="$${gen_file%.in}"; \ if [ "$${gen_file}" != "$${file}" ]; then \ - $$("# Copy the file first, making sure we keep permissions."); \ + $$(: "Copy the file first, making sure we keep permissions."); \ cp -a "$${gen_file}" "$${file}"; \ \ - $$("# Run actual substitutions."); \ + $$(: "Run actual substitutions."); \ PREFIX='$(PREFIX)'; \ ETCDIR='$(ETCDIR)'; \ BINDIR='$(BINDIR)'; \ @@ -113,7 +113,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."); \ + $(: "Create (and save) destination directory."); \ dest='$(DESTDIR)'; \ case "$${dir}" in \ ('bin') dest="$${dest}$(BINDIR)/";; \ @@ -124,10 +124,10 @@ install_scripts: esac; \ $(INSTALL_DIR) "$${dest}"; \ \ - $("# Iterate over files and ..."); \ + $(: "Iterate over files and ..."); \ for gen_file in "$${dir}/"*; do \ file="$${gen_file%.in}"; \ - $("# ... filter out generation templates and anything not ending in '.features' for the feature directory."); \ + $(: "... filter out generation templates and anything not ending in '.features' for the feature directory."); \ if [ "$${gen_file}" != "$${file}" ] || ( [ "$${dir}" = 'share/x2gofeature.d' ] && [ "$${file%.features}" = "$${file}" ] ); then \ continue; \ fi; \ @@ -167,7 +167,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."); \ + $(: "Create (and save) destination directory."); \ dest='$(DESTDIR)'; \ case "$${dir}" in \ ('bin') dest="$${dest}$(BINDIR)/";; \ @@ -178,9 +178,9 @@ uninstall_scripts: esac; \ $(INSTALL_DIR) "$${dest}"; \ \ - $("# Iterate over files and ..."); \ + $(: "Iterate over files and ..."); \ for gen_file in "$${dir}/"*; do \ - $("# ... map generation templates to generated files (so that uninstallation works correctly after cleaning as well)."); \ + $(: "... map generation templates to generated files (so that uninstallation works correctly after cleaning as well)."); \ file="$${gen_file%.in}"; \ $(RM_FILE) "$${dest}/$${file}"; \ done; \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git