diff -r b58109b7b321 -r e013ddebc063 Makefile.in
--- a/Makefile.in	Sat Aug 14 16:37:11 2010 +0200
+++ b/Makefile.in	Thu Apr 28 23:36:37 2011 +0200
@@ -234,10 +234,12 @@
 #  - change every occurrence of CT_TOP_DIR to CT_LIB_DIR
 install-lib-samples: $(DESTDIR)$(LIBDIR) install-lib-main
 	@echo "  INSTDIR 'samples/'"
-	@tar cf - samples |(cd "$(DESTDIR)$(LIBDIR)"; tar xf -)
-	@for samp_file in "$(DESTDIR)$(LIBDIR)/samples/"*"/crosstool.config"; do                    \
-	     $(sed) -r -i -e 's,\$$\{CT_TOP_DIR\},\$$\{CT_LIB_DIR\},g;' $${samp_file};           \
-	     $(sed) -r -i -e 's,^(CT_WORK_DIR)=.*,\1="\$${CT_TOP_DIR}/targets",;' $${samp_file}; \
+	@for samp_file in samples/*/crosstool.config; do                        \
+	     mkdir -p "$(DESTDIR)$(LIBDIR)/$${samp_file%/*}";                   \
+	     $(sed) -r -e 's:\$$\{CT_TOP_DIR\}:\$$\{CT_LIB_DIR\}:;'             \
+	               -e 's:^(CT_WORK_DIR)=.*:\1="\$${CT_TOP_DIR}/.build":;'   \
+	            $${samp_file}                                               \
+	            >"$(DESTDIR)$(LIBDIR)/$${samp_file}";                       \
 	 done
 
 install-doc: $(DESTDIR)$(DOCDIR)