Print a little bit of progress in ./configure (computing the version string can be long, especially on networked file systems).
/trunk/configure | 6 6 0 0 ++++++
/trunk/Makefile.in | 14 8 6 0 ++++++++------
2 files changed, 14 insertions(+), 6 deletions(-)
1.1 --- a/Makefile.in Tue Jun 10 22:10:40 2008 +0000
1.2 +++ b/Makefile.in Wed Jun 11 20:40:38 2008 +0000
1.3 @@ -89,13 +89,15 @@
1.4 false; \
1.5 fi
1.6
1.7 -install-bin: install-local-test $(BINDIR)
1.8 +install-%: install-local-test
1.9 +
1.10 +install-bin: $(BINDIR)
1.11 @echo " INST ct-ng"
1.12 @install -m 755 ct-ng $(BINDIR)/ct-ng
1.13
1.14 -install-lib: install-local-test $(LIBDIR) install-lib-main install-lib-samples
1.15 +install-lib: uninstall-lib $(LIBDIR) install-lib-main install-lib-samples
1.16
1.17 -install-lib-main: install-local-test $(LIBDIR)
1.18 +install-lib-main: $(LIBDIR)
1.19 @for src_dir in arch config kconfig patches scripts tools; do \
1.20 echo " INST $${src_dir}/"; \
1.21 tar cf - --exclude=.svn $${src_dir} |(cd $(LIBDIR); tar xf -); \
1.22 @@ -106,20 +108,20 @@
1.23
1.24 # Samples need a little love:
1.25 # - change every occurrence of CT_TOP_DIR to CT_LIB_DIR
1.26 -install-lib-samples: install-local-test $(LIBDIR) install-lib-main
1.27 +install-lib-samples: $(LIBDIR) install-lib-main
1.28 @echo " INST samples/"
1.29 @tar cf - --exclude=.svn samples |(cd $(LIBDIR); tar xf -)
1.30 @for samp_file in $(LIBDIR)/samples/*/crosstool.config; do \
1.31 sed -r -i -e 's,\$$\{CT_TOP_DIR\},\$$\{CT_LIB_DIR\},g;' $${samp_file}; \
1.32 done
1.33
1.34 -install-doc: install-local-test $(DOCDIR)
1.35 +install-doc: $(DOCDIR)
1.36 @for doc_file in docs/CREDITS docs/overview.txt; do \
1.37 echo " INST $${doc_file}"; \
1.38 install -m 644 "$${doc_file}" $(DOCDIR); \
1.39 done
1.40
1.41 -install-man: install-local-test $(MANDIR)
1.42 +install-man: $(MANDIR)
1.43 @echo " INST ct-ng.1.gz"
1.44 @install -m 644 docs/ct-ng.1.gz $(MANDIR)
1.45
2.1 --- a/configure Tue Jun 10 22:10:40 2008 +0000
2.2 +++ b/configure Wed Jun 11 20:40:38 2008 +0000
2.3 @@ -123,6 +123,7 @@
2.4
2.5 # If this version is a svn snapshot, try to get the revision number
2.6 # If we can't get the revision number, use date
2.7 +echo -n "Computing version string... "
2.8 case "${VERSION}" in
2.9 *+svn)
2.10 REVISION=$(LC_ALL=C svnversion)
2.11 @@ -137,13 +138,17 @@
2.12 esac
2.13 ;;
2.14 esac
2.15 +echo "${VERSION}"
2.16
2.17 # Check bash is present, and at least version 3.0
2.18 +echo -n "Checking bash is at least bash-3.0... "
2.19 [ -x /bin/bash ] || do_error "bash 3.0 or above was not found in /bin/bash"
2.20 bash_version=$(/bin/bash -c 'echo ${BASH_VERSION}')
2.21 bash_major=$(/bin/bash -c 'echo ${BASH_VERSINFO[0]}')
2.22 [ ${bash_major} -ge 3 ] || do_error "bash 3.0 or above is needed (/bin/bash is ${bash_version})"
2.23 +echo "ok (${bash_version})"
2.24
2.25 +echo -n "Building up Makefile... "
2.26 sed -r -e "s,@@BINDIR@@,${BINDIR},g;" \
2.27 -e "s,@@LIBDIR@@,${LIBDIR},g;" \
2.28 -e "s,@@DOCDIR@@,${DOCDIR},g;" \
2.29 @@ -152,6 +157,7 @@
2.30 -e "s,@@DATE@@,${DATE},g;" \
2.31 -e "s,@@LOCAL@@,${LOCAL_set},g;" \
2.32 Makefile.in >Makefile
2.33 +echo "ok"
2.34
2.35 cat <<__EOF__
2.36 crosstool-NG configured as follows: