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(-)
This commit is contained in:
Yann E. MORIN" 2008-06-11 20:40:38 +00:00
parent bfb7f715f2
commit b35770100e
2 changed files with 14 additions and 6 deletions

View File

@ -89,13 +89,15 @@ install-local-test:
false; \
fi
install-bin: install-local-test $(BINDIR)
install-%: install-local-test
install-bin: $(BINDIR)
@echo " INST ct-ng"
@install -m 755 ct-ng $(BINDIR)/ct-ng
install-lib: install-local-test $(LIBDIR) install-lib-main install-lib-samples
install-lib: uninstall-lib $(LIBDIR) install-lib-main install-lib-samples
install-lib-main: install-local-test $(LIBDIR)
install-lib-main: $(LIBDIR)
@for src_dir in arch config kconfig patches scripts tools; do \
echo " INST $${src_dir}/"; \
tar cf - --exclude=.svn $${src_dir} |(cd $(LIBDIR); tar xf -); \
@ -106,20 +108,20 @@ install-lib-main: install-local-test $(LIBDIR)
# Samples need a little love:
# - change every occurrence of CT_TOP_DIR to CT_LIB_DIR
install-lib-samples: install-local-test $(LIBDIR) install-lib-main
install-lib-samples: $(LIBDIR) install-lib-main
@echo " INST samples/"
@tar cf - --exclude=.svn samples |(cd $(LIBDIR); tar xf -)
@for samp_file in $(LIBDIR)/samples/*/crosstool.config; do \
sed -r -i -e 's,\$$\{CT_TOP_DIR\},\$$\{CT_LIB_DIR\},g;' $${samp_file}; \
done
install-doc: install-local-test $(DOCDIR)
install-doc: $(DOCDIR)
@for doc_file in docs/CREDITS docs/overview.txt; do \
echo " INST $${doc_file}"; \
install -m 644 "$${doc_file}" $(DOCDIR); \
done
install-man: install-local-test $(MANDIR)
install-man: $(MANDIR)
@echo " INST ct-ng.1.gz"
@install -m 644 docs/ct-ng.1.gz $(MANDIR)

6
configure vendored
View File

@ -123,6 +123,7 @@ fi
# If this version is a svn snapshot, try to get the revision number
# If we can't get the revision number, use date
echo -n "Computing version string... "
case "${VERSION}" in
*+svn)
REVISION=$(LC_ALL=C svnversion)
@ -137,13 +138,17 @@ case "${VERSION}" in
esac
;;
esac
echo "${VERSION}"
# Check bash is present, and at least version 3.0
echo -n "Checking bash is at least bash-3.0... "
[ -x /bin/bash ] || do_error "bash 3.0 or above was not found in /bin/bash"
bash_version=$(/bin/bash -c 'echo ${BASH_VERSION}')
bash_major=$(/bin/bash -c 'echo ${BASH_VERSINFO[0]}')
[ ${bash_major} -ge 3 ] || do_error "bash 3.0 or above is needed (/bin/bash is ${bash_version})"
echo "ok (${bash_version})"
echo -n "Building up Makefile... "
sed -r -e "s,@@BINDIR@@,${BINDIR},g;" \
-e "s,@@LIBDIR@@,${LIBDIR},g;" \
-e "s,@@DOCDIR@@,${DOCDIR},g;" \
@ -152,6 +157,7 @@ sed -r -e "s,@@BINDIR@@,${BINDIR},g;" \
-e "s,@@DATE@@,${DATE},g;" \
-e "s,@@LOCAL@@,${LOCAL_set},g;" \
Makefile.in >Makefile
echo "ok"
cat <<__EOF__
crosstool-NG configured as follows: