aboutsummaryrefslogtreecommitdiff
path: root/debian/Makefile.nx-libs
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-03-22 22:33:40 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-03-22 22:33:40 +0100
commit8f151d797b015b7d1070151e75d56587a7f3652f (patch)
tree2f16206b5d203ed56cf5ddd24fc9603cfdec7d0e /debian/Makefile.nx-libs
parent258902bec76cc4828ab7453df7406957ce93048a (diff)
downloadnx-libs-8f151d797b015b7d1070151e75d56587a7f3652f.tar.gz
nx-libs-8f151d797b015b7d1070151e75d56587a7f3652f.tar.bz2
nx-libs-8f151d797b015b7d1070151e75d56587a7f3652f.zip
Work-in patch from Jan Engehardt for working around different improper bash implementations of string-in-string replacing. (Fixes: #145).
Diffstat (limited to 'debian/Makefile.nx-libs')
-rw-r--r--debian/Makefile.nx-libs12
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 74f0d3a38..beb522c5b 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -93,23 +93,23 @@ install-full:
cp -aL nx-X11/exports/include/* nx-X11/.build-exports/include
# copy libs (for libnx-x11), we want the targets of the links
- find nx-X11/exports/lib/ | grep -F ".so" | while read libpath; do \
+ . replace.sh; set -x; find nx-X11/exports/lib/ | grep -F ".so" | while read libpath; do \
libfile=$$(basename $$libpath); \
libdir=$$(dirname $$libpath); \
link=$$(readlink $$libpath); \
\
- mkdir -p $${libdir//exports/.build-exports}; \
- cp -a $${libpath/$$libfile/$$link} $${libdir//exports/.build-exports}; \
+ mkdir -p "$$(string_rep "$$libdir" exports .build-exports)"; \
+ cp -a "$$(string_rep "$$libpath" "$$libfile" "$$link")" "$$(string_rep "$$libdir" exports .build-exports)"; \
done;
$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11
$(COPY_SYMLINK) nx-X11/.build-exports/lib/*.so* $(DESTDIR)$(NXLIBDIR)/X11/
- find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \
+ . replace.sh; set -x; find nx-X11/.build-exports/include/ -type d | grep -v "include/X11/bitmaps" | \
while read dirname; do \
- $(INSTALL_DIR) $${dirname//"nx-X11/.build-exports/include"/"$(DESTDIR)$(PREFIX)/include/nx"}; \
+ $(INSTALL_DIR) "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(PREFIX)/include/nx")"; \
$(INSTALL_FILE) $${dirname}/*.h \
- $${dirname//"nx-X11/.build-exports/include"/"$(DESTDIR)$(PREFIX)/include/nx"}/ || true; \
+ "$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(PREFIX)/include/nx")"/ || true; \
done; \
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/X11/bitmaps