1.1 --- a/Makefile.in Sun Dec 28 10:19:50 2008 +0000
1.2 +++ b/Makefile.in Sun Jan 18 15:40:02 2009 +0000
1.3 @@ -15,7 +15,14 @@
1.4 MANDIR := @@MANDIR@@
1.5 DATE := @@DATE@@
1.6 LOCAL := @@LOCAL@@
1.7 -MAKE := $(shell which $(MAKE) 2>/dev/null || type -p $(MAKE) 2>/dev/null || echo "ct-ng:nomake")
1.8 +
1.9 +# Paths found by ./configure
1.10 +CT_install:=@@install@@
1.11 +CT_make :=@@make@@
1.12 +CT_bash :=@@bash@@
1.13 +CT_grep :=@@grep@@
1.14 +CT_awk :=@@awk@@
1.15 +CT_sed :=@@sed@@
1.16
1.17 ###############################################################################
1.18 # Sanity checks
1.19 @@ -25,11 +32,6 @@
1.20 @echo "$< did changed: you must re-run './configure'"
1.21 @false
1.22
1.23 -# Check we do have make
1.24 -ifeq ($(strip $(MAKE)),ct-ng:nomake)
1.25 - $(error 'make' was not found on your system)
1.26 -endif
1.27 -
1.28 # If installing with DESTDIR, check it's an absolute path
1.29 ifneq ($(strip $(DESTDIR)),)
1.30 ifneq ($(DESTDIR),$(abspath /$(DESTDIR)))
1.31 @@ -74,14 +76,19 @@
1.32
1.33 %: %.in Makefile
1.34 @echo " SED '$@'"
1.35 - @sed -r -e 's,@@CT_MAKE@@,$(MAKE),g;' \
1.36 - -e 's,@@CT_BINDIR@@,$(BINDIR),g;' \
1.37 - -e 's,@@CT_LIBDIR@@,$(LIBDIR),g;' \
1.38 - -e 's,@@CT_DOCDIR@@,$(DOCDIR),g;' \
1.39 - -e 's,@@CT_MANDIR@@,$(MANDIR),g;' \
1.40 - -e 's,@@CT_VERSION@@,$(VERSION),g;' \
1.41 - -e 's,@@CT_DATE@@,$(DATE),g;' \
1.42 - $@.in >$@
1.43 + @$(sed) -r -e 's,@@CT_BINDIR@@,$(BINDIR),g;' \
1.44 + -e 's,@@CT_LIBDIR@@,$(LIBDIR),g;' \
1.45 + -e 's,@@CT_DOCDIR@@,$(DOCDIR),g;' \
1.46 + -e 's,@@CT_MANDIR@@,$(MANDIR),g;' \
1.47 + -e 's,@@CT_VERSION@@,$(VERSION),g;' \
1.48 + -e 's,@@CT_DATE@@,$(DATE),g;' \
1.49 + -e 's,@@CT_install@@,$(CT_install),g;' \
1.50 + -e 's,@@CT_make@@,$(CT_make),g;' \
1.51 + -e 's,@@CT_bash@@,$(CT_bash),g;' \
1.52 + -e 's,@@CT_grep@@,$(CT_grep),g;' \
1.53 + -e 's,@@CT_awk@@,$(CT_awk),g;' \
1.54 + -e 's,@@CT_sed@@,$(CT_sed),g;' \
1.55 + $@.in >$@
1.56
1.57 #--------------------------------------
1.58 # Clean rules
1.59 @@ -121,7 +128,7 @@
1.60
1.61 install-bin: $(DESTDIR)$(BINDIR)
1.62 @echo " INST 'ct-ng'"
1.63 - @install -m 755 ct-ng "$(DESTDIR)$(BINDIR)/ct-ng"
1.64 + @$(install) -m 755 ct-ng "$(DESTDIR)$(BINDIR)/ct-ng"
1.65
1.66 # If one is hacking crosstool-NG, the patch set might change between any two
1.67 # installations of the same VERSION, thus the patches must be removed prior
1.68 @@ -136,31 +143,31 @@
1.69 done
1.70 @rm -f "$(DESTDIR)$(LIBDIR)/scripts/addToolVersion.sh"
1.71 @echo " INST 'steps.mk'"
1.72 - @install -m 644 steps.mk "$(DESTDIR)$(LIBDIR)/steps.mk"
1.73 + @$(install) -m 644 steps.mk "$(DESTDIR)$(LIBDIR)/steps.mk"
1.74
1.75 # Samples need a little love:
1.76 # - change every occurrence of CT_TOP_DIR to CT_LIB_DIR
1.77 install-lib-samples: $(DESTDIR)$(LIBDIR) install-lib-main
1.78 @echo " INST 'samples/'"
1.79 @tar cf - --exclude=.svn samples |(cd "$(DESTDIR)$(LIBDIR)"; tar xf -)
1.80 - @for samp_file in "$(DESTDIR)$(LIBDIR)/samples/"*"/crosstool.config"; do \
1.81 - sed -r -i -e 's,\$$\{CT_TOP_DIR\},\$$\{CT_LIB_DIR\},g;' $${samp_file}; \
1.82 - sed -r -i -e 's,^(CT_WORK_DIR)=.*,\1="\$${CT_TOP_DIR}/targets",;' $${samp_file}; \
1.83 + @for samp_file in "$(DESTDIR)$(LIBDIR)/samples/"*"/crosstool.config"; do \
1.84 + $(sed) -r -i -e 's,\$$\{CT_TOP_DIR\},\$$\{CT_LIB_DIR\},g;' $${samp_file}; \
1.85 + $(sed) -r -i -e 's,^(CT_WORK_DIR)=.*,\1="\$${CT_TOP_DIR}/targets",;' $${samp_file}; \
1.86 done
1.87
1.88 install-doc: $(DESTDIR)$(DOCDIR)
1.89 - @for doc_file in docs/CREDITS docs/overview.txt; do \
1.90 - echo " INST '$${doc_file}'"; \
1.91 - install -m 644 "$${doc_file}" "$(DESTDIR)$(DOCDIR)"; \
1.92 + @for doc_file in docs/CREDITS docs/overview.txt; do \
1.93 + echo " INST '$${doc_file}'"; \
1.94 + $(install) -m 644 "$${doc_file}" "$(DESTDIR)$(DOCDIR)"; \
1.95 done
1.96
1.97 install-man: $(DESTDIR)$(MANDIR)
1.98 @echo " INST 'ct-ng.1.gz'"
1.99 - @install -m 644 docs/ct-ng.1.gz "$(DESTDIR)$(MANDIR)"
1.100 + @$(install) -m 644 docs/ct-ng.1.gz "$(DESTDIR)$(MANDIR)"
1.101
1.102 $(sort $(DESTDIR)$(BINDIR) $(DESTDIR)$(LIBDIR) $(DESTDIR)$(DOCDIR) $(DESTDIR)$(MANDIR)):
1.103 @echo " MKDIR '$@'"
1.104 - @install -m 755 -d "$@"
1.105 + @$(install) -m 755 -d "$@"
1.106
1.107
1.108 #--------------------------------------