This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 1d97577d9412672c7246917474686ce11f9305c1 Author: Mihai Moldovan <ionic@ionic.de> Date: Sun Jun 23 05:31:53 2019 +0200 x2goserver/Makefile: remove indirections, not needed any longer and leading to build failures now. --- debian/changelog | 2 ++ x2goserver/Makefile | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8d8eb4b..340cab6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -110,6 +110,8 @@ x2goserver (4.1.0.4-0x2go1.1) UNRELEASED; urgency=medium - x2goserver/bin/x2gopath.in: add and use support for NXLIBDIR; drop the lib-subdir detection. - x2goserver/bin/x2gopath.in: use [] instead of test, for consistency. + - x2goserver/Makefile: remove indirections, not needed any longer and + leading to build failures now. * debian/control: + Build-depend upon lsb-release for distro version detection. * debian/x2goserver.manpages: diff --git a/x2goserver/Makefile b/x2goserver/Makefile index d3dc59d..c3bbc78 100755 --- a/x2goserver/Makefile +++ b/x2goserver/Makefile @@ -40,7 +40,7 @@ build-arch: build-indep: build_pod2man build_man2html for dir in 'bin' 'sbin' 'lib' 'share/x2gofeature.d'; do \ - for gen_file in "$${!dir}/"*; do \ + for gen_file in "$${dir}/"*; do \ file="$${gen_file%.in}"; \ if [ "$${gen_file}" != "$${file}" ]; then \ $$("# Copy the file first, making sure we keep permissions."); \ @@ -98,7 +98,7 @@ clean-arch: clean-indep: clean_man2html for dir in 'bin' 'sbin' 'lib' 'share/x2gofeature.d'; do \ - for gen_file in "$${!dir}/"*; do \ + for gen_file in "$${dir}/"*; do \ file="$${gen_file%.in}"; \ if [ "$${gen_file}" != "$${file}" ]; then \ $(RM_FILE) "$${file}"; \ @@ -125,7 +125,7 @@ install_scripts: $(INSTALL_DIR) "$${dest}"; \ \ $("# Iterate over files and ..."); \ - for gen_file in "$${!dir}/"*; do \ + for gen_file in "$${dir}/"*; do \ file="$${gen_file%.in}"; \ $("# ... 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 \ @@ -179,7 +179,7 @@ uninstall_scripts: $(INSTALL_DIR) "$${dest}"; \ \ $("# Iterate over files and ..."); \ - for gen_file in "$${!dir}/"*; do \ + for gen_file in "$${dir}/"*; do \ $("# ... map generation templates to generated files (so that uninstallation works correctly after cleaning as well)."); \ file="$${gen_file%.in}"; \ $(RM_FILE) "$${dest}/$${file}"; \ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git