Commit 1d97577d authored by Mihai Moldovan's avatar Mihai Moldovan
Browse files

x2goserver/Makefile: remove indirections, not needed any longer and leading to build failures now.

parent c2efe763
......@@ -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:
......
......@@ -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}"; \
......
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