summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-04-28 21:36:37 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2011-04-28 21:36:37 (GMT)
commitff3fba024c3e1e92fd63a8e477dbfd6fadd3cca1 (patch)
tree7a330c17a5f7a75ee54982a6b65ff150a3ce450f
parent666d8109257dda19674d77d46d9ea747e2752b18 (diff)
scripts: fix installing samples
It's been a while now that the working directory CT_WORK_DIR has been changed from 'targets' to '.build'. Fix the install procedure to properly tweak the installed samples. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
-rw-r--r--Makefile.in10
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in
index 81d23b7..d68436e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -234,10 +234,12 @@ install-lib-main: $(DESTDIR)$(LIBDIR) $(patsubst %,install-lib-%,$(LIB_SUB_DIR))
# - 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)