[X2Go-Commits] [x2goserver] 01/01: x2goserver/bin/x2gopath.in: fix syntax error due to non-duplicated dollar signs in comment lines.

[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 af87ec2f367a8155e88ac3f08175b65a80d599e0
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Jun 23 06:40:51 2019 +0200

    x2goserver/bin/x2gopath.in: fix syntax error due to non-duplicated dollar signs in comment lines.
---
 debian/changelog    |  2 ++
 x2goserver/Makefile | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1413bc7..5668709 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -120,6 +120,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium
       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.
+    - x2goserver/bin/x2gopath.in: fix syntax error due to non-duplicated
+      dollar signs in comment lines.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:
diff --git a/x2goserver/Makefile b/x2goserver/Makefile
index a806c61..4f3ad9f 100755
--- a/x2goserver/Makefile
+++ b/x2goserver/Makefile
@@ -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