Commit af87ec2f authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files

x2goserver/bin/x2gopath.in: fix syntax error due to non-duplicated dollar signs in comment lines.

parent fe13d0ce
......@@ -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:
......
......@@ -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; \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment