1.1 --- a/Makefile.in Fri Jun 25 12:33:30 2010 +0200
1.2 +++ b/Makefile.in Sun Jul 11 21:37:43 2010 +0200
1.3 @@ -195,7 +195,7 @@
1.4 real-install: $(patsubst %,install-%,$(TARGETS)) install-post
1.5
1.6 install-bin: $(DESTDIR)$(BINDIR)
1.7 - @echo " INST 'ct-ng'"
1.8 + @echo " INST 'ct-ng'"
1.9 @$(install) -m 755 ct-ng "$(DESTDIR)$(BINDIR)/ct-ng"
1.10
1.11 # If one is hacking crosstool-NG, the patch set might change between any two
1.12 @@ -204,24 +204,31 @@
1.13 # is the goal of the install-lib rule to install the lib/ directory...
1.14 install-lib: uninstall-lib $(DESTDIR)$(LIBDIR) install-lib-main install-lib-samples
1.15
1.16 -install-lib-main: $(DESTDIR)$(LIBDIR)
1.17 - @for src_dir in config contrib kconfig patches scripts; do \
1.18 - echo " INST '$${src_dir}/'"; \
1.19 - tar cf - --exclude='*.sh.in' $${src_dir} \
1.20 - |(cd "$(DESTDIR)$(LIBDIR)"; tar xf -); \
1.21 - done
1.22 +LIB_SUB_DIR := config contrib kconfig patches scripts
1.23 +$(patsubst %,install-lib-%-copy,$(LIB_SUB_DIR)): $(DESTDIR)$(LIBDIR)
1.24 + @echo " INSTDIR '$(patsubst install-lib-%-copy,%,$(@))/'"
1.25 + @tar cf - --exclude='*.sh.in' $(patsubst install-lib-%-copy,%,$(@)) \
1.26 + |(cd "$(DESTDIR)$(LIBDIR)"; tar xf -)
1.27 +
1.28 +# Huh? It seems we need at least one command to make this rule kick-in.
1.29 +install-lib-%: install-lib-%-copy; @true
1.30 +
1.31 +# Huh? that one does not inherit the -opy dependency, above...
1.32 +install-lib-scripts: install-lib-scripts-copy
1.33 @chmod a+x $(DESTDIR)$(LIBDIR)/scripts/crosstool-NG.sh
1.34 @chmod a+x $(DESTDIR)$(LIBDIR)/scripts/saveSample.sh
1.35 @rm -f "$(DESTDIR)$(LIBDIR)/scripts/addToolVersion.sh"
1.36 - @echo " INST 'steps.mk'"
1.37 +
1.38 +install-lib-main: $(DESTDIR)$(LIBDIR) $(patsubst %,install-lib-%,$(LIB_SUB_DIR))
1.39 + @echo " INST 'steps.mk'"
1.40 @$(install) -m 644 steps.mk "$(DESTDIR)$(LIBDIR)/steps.mk"
1.41 - @echo " INST 'paths.mk'"
1.42 + @echo " INST 'paths.mk'"
1.43 @$(install) -m 644 paths.mk "$(DESTDIR)$(LIBDIR)/paths.mk"
1.44
1.45 # Samples need a little love:
1.46 # - change every occurrence of CT_TOP_DIR to CT_LIB_DIR
1.47 install-lib-samples: $(DESTDIR)$(LIBDIR) install-lib-main
1.48 - @echo " INST 'samples/'"
1.49 + @echo " INSTDIR 'samples/'"
1.50 @tar cf - samples |(cd "$(DESTDIR)$(LIBDIR)"; tar xf -)
1.51 @for samp_file in "$(DESTDIR)$(LIBDIR)/samples/"*"/crosstool.config"; do \
1.52 $(sed) -r -i -e 's,\$$\{CT_TOP_DIR\},\$$\{CT_LIB_DIR\},g;' $${samp_file}; \
1.53 @@ -230,22 +237,22 @@
1.54
1.55 install-doc: $(DESTDIR)$(DOCDIR)
1.56 @for doc_file in docs/CREDITS docs/overview.txt; do \
1.57 - echo " INST '$${doc_file}'"; \
1.58 + echo " INST '$${doc_file}'"; \
1.59 $(install) -m 644 "$${doc_file}" "$(DESTDIR)$(DOCDIR)"; \
1.60 done
1.61
1.62 install-man: $(DESTDIR)$(MANDIR)
1.63 - @echo " INST 'ct-ng.1.gz'"
1.64 + @echo " INST 'ct-ng.1.gz'"
1.65 @$(install) -m 644 docs/ct-ng.1.gz "$(DESTDIR)$(MANDIR)"
1.66
1.67 $(sort $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(DOCDIR) $(DESTDIR)$(MANDIR)):
1.68 - @echo " MKDIR '$@'"
1.69 + @echo " MKDIR '$@/'"
1.70 @$(install) -m 755 -d "$@"
1.71
1.72 install-post:
1.73 @echo
1.74 - @echo "For auto-completion, do not forget to install 'ct-ng.comp'"
1.75 - @echo "into you 'bash_completion.d'"
1.76 + @echo "For auto-completion, do not forget to install 'ct-ng.comp' into"
1.77 + @echo "your bash completion directory (usually /etc/bash_completion.d)"
1.78
1.79 #--------------------------------------
1.80 # Uninstall rules
1.81 @@ -253,19 +260,19 @@
1.82 real-uninstall: $(patsubst %,uninstall-%,$(TARGETS))
1.83
1.84 uninstall-bin:
1.85 - @echo " RM '$(DESTDIR)$(BINDIR)/ct-ng'"
1.86 + @echo " RM '$(DESTDIR)$(BINDIR)/ct-ng'"
1.87 @rm -f "$(DESTDIR)$(BINDIR)/ct-ng"
1.88
1.89 uninstall-lib:
1.90 - @echo " RMDIR '$(DESTDIR)$(LIBDIR)/'"
1.91 + @echo " RMDIR '$(DESTDIR)$(LIBDIR)/'"
1.92 @rm -rf "$(DESTDIR)$(LIBDIR)"
1.93
1.94 uninstall-doc:
1.95 - @echo " RMDIR '$(DESTDIR)$(DOCDIR)/'"
1.96 + @echo " RMDIR '$(DESTDIR)$(DOCDIR)/'"
1.97 @rm -rf "$(DESTDIR)$(DOCDIR)"
1.98
1.99 uninstall-man:
1.100 - @echo " RM '$(DESTDIR)$(MANDIR)/ct-ng.1.gz'"
1.101 + @echo " RM '$(DESTDIR)$(MANDIR)/ct-ng.1.gz'"
1.102 @rm -f "$(DESTDIR)$(MANDIR)/ct-ng.1"{,.gz}
1.103
1.104 endif # Not --local