Revision: 41252
http://brlcad.svn.sourceforge.net/brlcad/?rev=41252&view=rev
Author: starseeker
Date: 2010-11-05 14:08:22 +0000 (Fri, 05 Nov 2010)
Log Message:
-----------
Try replacing $(ECHO) with echo in the Makefile.am files - the newest libtool
is using a printf expression for $(ECHO) that is resulting in extra n
characters at the end of lines.
Modified Paths:
--------------
brlcad/trunk/Makefile.am
brlcad/trunk/bench/Makefile.am
brlcad/trunk/db/Makefile.am
brlcad/trunk/include/conf/Makefile.am
brlcad/trunk/src/other/step/include/conf/Makefile.am
Modified: brlcad/trunk/Makefile.am
===================================================================
--- brlcad/trunk/Makefile.am 2010-11-05 12:36:43 UTC (rev 41251)
+++ brlcad/trunk/Makefile.am 2010-11-05 14:08:22 UTC (rev 41252)
@@ -124,21 +124,21 @@
# sync every time it's edited).
$(PACKAGE_NAME)_$(BRLCAD_VERSION).pkg:
@if ! test -f "install.$(host_triplet).log" ; then \
- $(ECHO) ; \
- $(ECHO) "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \
- $(ECHO) " WARNING: It seems as though you might not have" ; \
- $(ECHO) " installed BRL-CAD yet?" ; \
- $(ECHO) ; \
- $(ECHO) " You should run 'make install' before creating a" ; \
- $(ECHO) " binary distribution package. Trying regardless." ; \
- $(ECHO) "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \
- $(ECHO) ; \
+ echo ; \
+ echo "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \
+ echo " WARNING: It seems as though you might not have" ; \
+ echo " installed BRL-CAD yet?" ; \
+ echo ; \
+ echo " You should run 'make install' before creating a" ; \
+ echo " binary distribution package. Trying regardless." ; \
+ echo "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \
+ echo ; \
fi
- @$(ECHO) "Building an Installer package for Mac OS X"
- @$(ECHO)
- @$(ECHO) "Warning: this package target presently assumes that the
install directory"
- @$(ECHO) " does not contain extra files and comprises a full
clean install."
- @$(ECHO)
+ @echo "Building an Installer package for Mac OS X"
+ @echo
+ @echo "Warning: this package target presently assumes that the install
directory"
+ @echo " does not contain extra files and comprises a full clean
install."
+ @echo
@if test -f "$(top_srcdir)/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf" ;
then \
perl -pi -e "s/BRL-CAD [0-9]*\.[0-9]*\.[0-9]*/BRL-CAD
$(BRLCAD_VERSION)/g" $(top_srcdir)/misc/macosx/Resources/ReadMe.rtfd/TXT.rtf ; \
fi
@@ -151,86 +151,86 @@
cd misc/macosx && $(MAKE) openUp
$(PACKAGE_NAME)_$(BRLCAD_VERSION).dmg: $(PACKAGE_NAME)_$(BRLCAD_VERSION).pkg
openUp
- @$(ECHO) "Building a Disk Image for Mac OS X"
- @$(ECHO)
+ @echo "Building a Disk Image for Mac OS X"
+ @echo
@${SH} $(top_srcdir)/sh/make_dmg.sh "$(PACKAGE_NAME)"
"$(BRLCAD_VERSION)" "$(top_srcdir)/misc/macosx/background.png"
# using home is probably not a great choice..
$(PACKAGE_NAME)_$(BRLCAD_VERSION).rpm: $(PACKAGE)-$(BRLCAD_VERSION).tar.gz
- @$(ECHO) "Building binary RPM for RedHat Linux"
- @$(ECHO)
+ @echo "Building binary RPM for RedHat Linux"
+ @echo
@CP@ $(PACKAGE)-$(BRLCAD_VERSION).tar.gz ${HOME}/rpm/SOURCES/
rpmbuild -ba $(top_builddir)/misc/brlcad.spec
@CP@ ${HOME}/rpm/RPMS/i386/$(PACKAGE_NAME)_$(BRLCAD_VERSION)_*.i386.rpm
.
@touch $(PACKAGE_NAME)_$(BRLCAD_VERSION).rpm
- @$(ECHO) "WARNING: Fake make placeholder created as
$(PACKAGE_NAME)_$(BRLCAD_VERSION).rpm"
- @$(ECHO)
+ @echo "WARNING: Fake make placeholder created as
$(PACKAGE_NAME)_$(BRLCAD_VERSION).rpm"
+ @echo
# using home is probably not a great choice..
# use PACKAGE instead of PACKAGE_NAME because it's a source release
$(PACKAGE)-$(BRLCAD_VERSION).src.rpm: $(PACKAGE)-$(BRLCAD_VERSION).tar.gz
- @$(ECHO) "Building source RPM for RedHat Linux"
+ @echo "Building source RPM for RedHat Linux"
@CP@ $(PACKAGE)-$(BRLCAD_VERSION).tar.gz ${HOME}/rpm/SOURCES/
rpmbuild -ba $(top_builddir)/misc/brlcad.spec
@CP@ ${HOME}/rpm/SRPMS/$(PACKAGE)-$(BRLCAD_VERSION)-*.src.rpm .
@touch $(PACKAGE)-$(BRLCAD_VERSION).src.rpm
- @$(ECHO) "WARNING: Fake make placeholder created as
$(PACKAGE)-$(BRLCAD_VERSION).src.rpm"
- @$(ECHO)
+ @echo "WARNING: Fake make placeholder created as
$(PACKAGE)-$(BRLCAD_VERSION).src.rpm"
+ @echo
$(PACKAGE_NAME)_$(BRLCAD_VERSION).deb:
- @$(ECHO) "Building a package for Debian Linux"
- @$(ECHO)
+ @echo "Building a package for Debian Linux"
+ @echo
@${SH} $(top_srcdir)/sh/make_deb.sh "$(PACKAGE_NAME)_$(BRLCAD_VERSION)"
$(PACKAGE_NAME)_$(BRLCAD_VERSION).zip:
@if ! test -f "install.$(host_triplet).log" ; then \
- $(ECHO) ; \
- $(ECHO) "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \
- $(ECHO) " WARNING: It seems as though you might not have" ; \
- $(ECHO) " installed BRL-CAD yet?" ; \
- $(ECHO) ; \
- $(ECHO) " You should run 'make install' before creating a" ; \
- $(ECHO) " binary distribution package. Trying regardless." ; \
- $(ECHO) "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \
- $(ECHO) ; \
+ echo ; \
+ echo "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \
+ echo " WARNING: It seems as though you might not have" ; \
+ echo " installed BRL-CAD yet?" ; \
+ echo ; \
+ echo " You should run 'make install' before creating a" ; \
+ echo " binary distribution package. Trying regardless." ; \
+ echo "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \
+ echo ; \
fi
- @$(ECHO) "Building a zip-compressed file archive"
- @$(ECHO)
+ @echo "Building a zip-compressed file archive"
+ @echo
@${SH} $(top_srcdir)/sh/make_zip.sh "$(PACKAGE_NAME)_$(BRLCAD_VERSION)"
- @$(ECHO)
- @$(ECHO) "Built $(PACKAGE_NAME)_$(BRLCAD_VERSION).zip for
$(host_triplet)"
+ @echo
+ @echo "Built $(PACKAGE_NAME)_$(BRLCAD_VERSION).zip for $(host_triplet)"
$(PACKAGE_NAME)_$(BRLCAD_VERSION).tar.gz:
$(PACKAGE_NAME)_$(BRLCAD_VERSION).tar
- @$(ECHO) "Building a gzip-compressed tape archive"
- @$(ECHO)
+ @echo "Building a gzip-compressed tape archive"
+ @echo
@${SH} $(top_srcdir)/sh/make_tgz.sh "$(PACKAGE_NAME)_$(BRLCAD_VERSION)"
- @$(ECHO)
- @$(ECHO) "Built $(PACKAGE_NAME)_$(BRLCAD_VERSION).tar.gz for
$(host_triplet)"
+ @echo
+ @echo "Built $(PACKAGE_NAME)_$(BRLCAD_VERSION).tar.gz for
$(host_triplet)"
$(PACKAGE_NAME)_$(BRLCAD_VERSION).tar.bz2:
$(PACKAGE_NAME)_$(BRLCAD_VERSION).tar
- @$(ECHO) "Building a bzip2-compressed tape archive"
- @$(ECHO)
+ @echo "Building a bzip2-compressed tape archive"
+ @echo
@${SH} $(top_srcdir)/sh/make_bz2.sh "$(PACKAGE_NAME)_$(BRLCAD_VERSION)"
- @$(ECHO)
- @$(ECHO) "Built $(PACKAGE_NAME)_$(BRLCAD_VERSION).tar.bz2 for
$(host_triplet)"
+ @echo
+ @echo "Built $(PACKAGE_NAME)_$(BRLCAD_VERSION).tar.bz2 for
$(host_triplet)"
$(PACKAGE_NAME)_$(BRLCAD_VERSION).tar:
@if ! test -f "install.$(host_triplet).log" ; then \
- $(ECHO) ; \
- $(ECHO) "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \
- $(ECHO) " WARNING: It seems as though you might not have" ; \
- $(ECHO) " installed BRL-CAD yet?" ; \
- $(ECHO) ; \
- $(ECHO) " You should run 'make install' before creating a" ; \
- $(ECHO) " binary distribution package. Trying regardless." ; \
- $(ECHO) "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \
- $(ECHO) ; \
+ echo ; \
+ echo "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \
+ echo " WARNING: It seems as though you might not have" ; \
+ echo " installed BRL-CAD yet?" ; \
+ echo ; \
+ echo " You should run 'make install' before creating a" ; \
+ echo " binary distribution package. Trying regardless." ; \
+ echo "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \
+ echo ; \
fi
- @$(ECHO) "Building an uncompressed tape archive"
- @$(ECHO)
+ @echo "Building an uncompressed tape archive"
+ @echo
@${SH} $(top_srcdir)/sh/make_tar.sh "$(PACKAGE_NAME)"
"$(BRLCAD_VERSION)" "$(DESTDIR)$(prefix)"
- @$(ECHO)
- @$(ECHO) "Built $(PACKAGE_NAME)_$(BRLCAD_VERSION).tar for
$(host_triplet)"
+ @echo
+ @echo "Built $(PACKAGE_NAME)_$(BRLCAD_VERSION).tar for $(host_triplet)"
#############
@@ -261,43 +261,43 @@
@TIMEFRAME=1 $(MAKE) benchmark
pkg: $(PACKAGE_NAME)_$(BRLCAD_VERSION).pkg
- @$(ECHO) "Done."
+ @echo "Done."
dmg: pkg $(PACKAGE_NAME)_$(BRLCAD_VERSION).dmg
- @$(ECHO) "Done."
+ @echo "Done."
rpm: $(PACKAGE_NAME)_$(BRLCAD_VERSION).rpm $(PACKAGE)-$(BRLCAD_VERSION).src.rpm
- @$(ECHO) "Done."
+ @echo "Done."
deb: $(PACKAGE_NAME)_$(BRLCAD_VERSION).deb
- @$(ECHO) "Done."
+ @echo "Done."
zip: $(PACKAGE_NAME)_$(BRLCAD_VERSION).zip
- @$(ECHO) "Done."
+ @echo "Done."
tgz: $(PACKAGE_NAME)_$(BRLCAD_VERSION).tar.gz
- @$(ECHO) "Done."
+ @echo "Done."
bz2: $(PACKAGE_NAME)_$(BRLCAD_VERSION).tar.bz2
- @$(ECHO) "Done."
+ @echo "Done."
tar: $(PACKAGE_NAME)_$(BRLCAD_VERSION).tar
- @$(ECHO) "Done."
+ @echo "Done."
package:
- @$(ECHO)
- @$(ECHO) "To build a BRL-CAD package for distribution, there are
various make"
- @$(ECHO) "targets available for various platforms:"
- @$(ECHO)
- @$(ECHO) " make pkg - Builds an Installer package for Mac OS
X"
- @$(ECHO) " make dmg - Builds a Disk Image for Mac OS X"
- @$(ECHO) " make rpm - Builds source and binary RPM for RedHat
Linux"
- @$(ECHO) " make deb - Builds a package for Debian Linux"
- @$(ECHO) " make zip - Builds a zip-compressed file archive"
- @$(ECHO) " make tgz - Builds a gzip-compressed tape archive"
- @$(ECHO) " make bz2 - Builds a bzip2-compressed tape archive"
- @$(ECHO) " make tar - Builds a uncompressed tape archive"
- @$(ECHO)
+ @echo
+ @echo "To build a BRL-CAD package for distribution, there are various
make"
+ @echo "targets available for various platforms:"
+ @echo
+ @echo " make pkg - Builds an Installer package for Mac OS
X"
+ @echo " make dmg - Builds a Disk Image for Mac OS X"
+ @echo " make rpm - Builds source and binary RPM for RedHat
Linux"
+ @echo " make deb - Builds a package for Debian Linux"
+ @echo " make zip - Builds a zip-compressed file archive"
+ @echo " make tgz - Builds a gzip-compressed tape archive"
+ @echo " make bz2 - Builds a bzip2-compressed tape archive"
+ @echo " make tar - Builds a uncompressed tape archive"
+ @echo
# make sure all files are in the repository are also in the dist.
# make sure files that should not be in the distribution in fact are
@@ -361,68 +361,68 @@
files="`find $(top_builddir)/src/tclscripts \( -name pkgIndex.tcl -o
-name tclIndex \)`" ; \
empty=`for file in $$files ; do found="\`grep -v '^#' $$file | perl
-0777 -pi -e 's/^\n//g'\`" ; if test "x$$found" = "x" ; then echo $$file ; fi ;
done | wc | awk '{print $$1}'` ; \
if test $$empty -gt 9 ; then \
- $(ECHO) ; \
- $(ECHO) "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \
- $(ECHO) " WARNING: Too many of the pkgIndex.tcl and" ; \
- $(ECHO) " tclIndex files are empty." ; \
- $(ECHO) ; \
- $(ECHO) " It is likely that the indices are not being" ; \
- $(ECHO) " generated properly which will affect run-time" ; \
- $(ECHO) " functionality. VERIFY THE FILES." ; \
- $(ECHO) "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \
- $(ECHO) ; \
+ echo ; \
+ echo "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \
+ echo " WARNING: Too many of the pkgIndex.tcl and" ; \
+ echo " tclIndex files are empty." ; \
+ echo ; \
+ echo " It is likely that the indices are not being" ; \
+ echo " generated properly which will affect run-time" ; \
+ echo " functionality. VERIFY THE FILES." ; \
+ echo "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \
+ echo ; \
fi ; \
if test "x$$warn_umask" = "xyes" ; then \
- $(ECHO) ; \
- $(ECHO) "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \
- $(ECHO) " WARNING: There is no execute permission on the" ; \
- $(ECHO) " install directory." ; \
- $(ECHO) ; \
- $(ECHO) " Consider running \"umask 022\" before installing" ; \
- $(ECHO) " next time. You should be able to repair this"; \
- $(ECHO) " installation's directory permissions with: " ; \
- $(ECHO) ; \
- $(ECHO) " find $(DESTDIR)$(prefix)/. -type d -exec chmod go+x {}
\;" ; \
+ echo ; \
+ echo "}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}" ; \
+ echo " WARNING: There is no execute permission on the" ; \
+ echo " install directory." ; \
+ echo ; \
+ echo " Consider running \"umask 022\" before installing" ; \
+ echo " next time. You should be able to repair this"; \
+ echo " installation's directory permissions with: " ; \
+ echo ; \
+ echo " find $(DESTDIR)$(prefix)/. -type d -exec chmod go+x {}
\;" ; \
if test -d "$(DESTDIR)$(bindir)" ; then \
if test "x$(DESTDIR)$(exec_prefix)/bin" != "x$(DESTDIR)$(bindir)"
; then \
- $(ECHO) " find $(DESTDIR)$(bindir)/. -type d -exec chmod
go+x {} \;" ; \
+ echo " find $(DESTDIR)$(bindir)/. -type d -exec chmod go+x
{} \;" ; \
fi ; \
fi ; \
if test -d "$(DESTDIR)$(sbindir)" ; then \
if test "x$(DESTDIR)$(exec_prefix)/sbin" !=
"x$(DESTDIR)$(sbindir)" ; then \
- $(ECHO) " find $(DESTDIR)$(sbindir)/. -type d -exec chmod
go+x {} \;" ; \
+ echo " find $(DESTDIR)$(sbindir)/. -type d -exec chmod go+x
{} \;" ; \
fi ; \
fi ; \
if test -d "$(DESTDIR)$(libexecdir)" ; then \
if test "x$(DESTDIR)$(exec_prefix)/libexec" !=
"x$(DESTDIR)$(libexecdir)" ; then \
- $(ECHO) " find $(DESTDIR)$(libexecdir)/. -type d -exec chmod
go+x {} \;" ; \
+ echo " find $(DESTDIR)$(libexecdir)/. -type d -exec chmod
go+x {} \;" ; \
fi ; \
fi ; \
if test -d "$(DESTDIR)$(datadir)" ; then \
if test "x$(DESTDIR)$(prefix)/share" != "x$(DESTDIR)$(datadir)" ;
then \
- $(ECHO) " find $(DESTDIR)$(prefix)/. -type d -exec chmod
go+x {} \;" ; \
+ echo " find $(DESTDIR)$(prefix)/. -type d -exec chmod go+x
{} \;" ; \
fi ; \
fi ; \
if test -d "$(DESTDIR)$(libdir)" ; then \
if test "x$(DESTDIR)$(exec_prefix)/lib" != "x$(DESTDIR)$(libdir)"
; then \
- $(ECHO) " find $(DESTDIR)$(libdir)/. -type d -exec chmod
go+x {} \;" ; \
+ echo " find $(DESTDIR)$(libdir)/. -type d -exec chmod go+x
{} \;" ; \
fi ; \
fi ; \
if test -d "$(DESTDIR)$(mandir)" ; then \
if test "x$(DESTDIR)$(prefix)/man" != "x$(DESTDIR)$(mandir)" ;
then \
- $(ECHO) " find $(DESTDIR)$(mandir)/. -type d -exec chmod
go+x {} \;" ; \
+ echo " find $(DESTDIR)$(mandir)/. -type d -exec chmod go+x
{} \;" ; \
fi ; \
fi ; \
if test -d "$(DESTDIR)$(includedir)" ; then \
if test "x$(DESTDIR)$(prefix)/include" !=
"x$(DESTDIR)$(includedir)" ; then \
- $(ECHO) " find $(DESTDIR)$(includedir)/. -type d -exec chmod
go+x {} \;" ; \
+ echo " find $(DESTDIR)$(includedir)/. -type d -exec chmod
go+x {} \;" ; \
fi ; \
fi ; \
- $(ECHO) ; \
- $(ECHO) " Do not presume the find example is all that is" ; \
- $(ECHO) " needed. VERIFY THE PERMISSIONS." ; \
- $(ECHO) "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \
- $(ECHO) ; \
+ echo ; \
+ echo " Do not presume the find example is all that is" ; \
+ echo " needed. VERIFY THE PERMISSIONS." ; \
+ echo "{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{" ; \
+ echo ; \
fi ; \
touch install.$(host_triplet).log ; \
if test -w install.$(host_triplet).log ; then \
@@ -430,7 +430,7 @@
if test "x$USER" = "x" ; then \
USER="unknown" ; \
fi ; \
- $(ECHO) "Installed BRL-CAD Release ${BRLCAD_VERSION} Build
${CONFIG_DATE} by ${USER} to $(DESTDIR)$(prefix) on `date`" >>
install.$(host_triplet).log ; \
+ echo "Installed BRL-CAD Release ${BRLCAD_VERSION} Build
${CONFIG_DATE} by ${USER} to $(DESTDIR)$(prefix) on `date`" >>
install.$(host_triplet).log ; \
chmod ugo+rw install.$(host_triplet).log ; \
fi
@@ -444,43 +444,43 @@
# to emphasize the achievement.
#
all-local:
- @$(ECHO) "Done."
- @$(ECHO)
- @$(ECHO) "BRL-CAD Release ${BRLCAD_VERSION}, Build ${CONFIG_DATE}"
- @$(ECHO)
+ @echo "Done."
+ @echo
+ @echo "BRL-CAD Release ${BRLCAD_VERSION}, Build ${CONFIG_DATE}"
+ @echo
@if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am"
-o "x$(MAKECMDGOALS)" = "xfast" -o "x$(.TARGETS)" = "xfast" ; then \
- $(ECHO) $(ECHO_N) "Elapsed compilation time: " ;\
+ echo $(ECHO_N) "Elapsed compilation time: " ;\
${SH} $(top_srcdir)/sh/elapsed.sh `cat
$(top_builddir)/include/conf/TS` ;\
- $(ECHO) $(ECHO_N) "Elapsed time since configuration: " ;\
+ echo $(ECHO_N) "Elapsed time since configuration: " ;\
${SH} $(top_srcdir)/sh/elapsed.sh ${CONFIG_TS} ;\
- $(ECHO) "---" ;\
- $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\
- $(ECHO) "Run 'make benchmark' to run the BRL-CAD Benchmark Suite" ;\
+ echo "---" ;\
+ echo "Run 'make install' to begin installation into $(prefix)" ;\
+ echo "Run 'make benchmark' to run the BRL-CAD Benchmark Suite" ;\
elif test "x$(MAKECMDGOALS)" = "xinstall-am" -o "x$(.TARGETS)" =
"xinstall-am" ; then \
- $(ECHO) $(ECHO_N) "Elapsed installation time: " ;\
+ echo $(ECHO_N) "Elapsed installation time: " ;\
${SH} $(top_srcdir)/sh/elapsed.sh `cat
$(top_builddir)/include/conf/TS` ;\
- $(ECHO) $(ECHO_N) "Elapsed time since configuration: " ;\
+ echo $(ECHO_N) "Elapsed time since configuration: " ;\
${SH} $(top_srcdir)/sh/elapsed.sh ${CONFIG_TS} ;\
- $(ECHO) "---" ;\
- $(ECHO) "Run 'make test' to run the BRL-CAD Test Suite" ;\
- $(ECHO) "Run 'make benchmark' to run the BRL-CAD Benchmark Suite" ;\
- $(ECHO) ;\
+ echo "---" ;\
+ echo "Run 'make test' to run the BRL-CAD Test Suite" ;\
+ echo "Run 'make benchmark' to run the BRL-CAD Benchmark Suite" ;\
+ echo ;\
line1=" BRL-CAD ${BRLCAD_VERSION} is now installed into $(prefix)" ;\
line2=" Be sure to add $(prefix)/bin to your PATH" ;\
- separator="`$(ECHO) $$line1 | tr '[[:print:]]' '*'`" ;\
- $(ECHO) "$${separator}****" ;\
- $(ECHO) "$$line1" ;\
- $(ECHO) "$$line2" ;\
- $(ECHO) "$${separator}****" ;\
+ separator="`echo $$line1 | tr '[[:print:]]' '*'`" ;\
+ echo "$${separator}****" ;\
+ echo "$$line1" ;\
+ echo "$$line2" ;\
+ echo "$${separator}****" ;\
elif test "x$(MAKECMDGOALS)" = "x" -a "x$(.TARGETS)" = "x" ; then \
- $(ECHO) $(ECHO_N) "Elapsed time: " ;\
+ echo $(ECHO_N) "Elapsed time: " ;\
${SH} $(top_srcdir)/sh/elapsed.sh `cat
$(top_builddir)/include/conf/TS` ;\
- $(ECHO) $(ECHO_N) "Elapsed time since configuration: " ;\
+ echo $(ECHO_N) "Elapsed time since configuration: " ;\
${SH} $(top_srcdir)/sh/elapsed.sh ${CONFIG_TS} ;\
- $(ECHO) "---" ;\
- $(ECHO) "Run 'make benchmark' to run the BRL-CAD Benchmark Suite" ;\
+ echo "---" ;\
+ echo "Run 'make benchmark' to run the BRL-CAD Benchmark Suite" ;\
fi
- @$(ECHO)
+ @echo
include $(top_srcdir)/misc/Makefile.defs
Modified: brlcad/trunk/bench/Makefile.am
===================================================================
--- brlcad/trunk/bench/Makefile.am 2010-11-05 12:36:43 UTC (rev 41251)
+++ brlcad/trunk/bench/Makefile.am 2010-11-05 14:08:22 UTC (rev 41252)
@@ -35,10 +35,10 @@
exit 1 ; \
fi ; \
fi
- @$(ECHO) "---"
- @$(ECHO) "Run 'make clean' in the bench directory to delete the log"
- @$(ECHO) "and image files generated during the benchmark analysis."
- @$(ECHO)
+ @echo "---"
+ @echo "Run 'make clean' in the bench directory to delete the log"
+ @echo "and image files generated during the benchmark analysis."
+ @echo
bench: run
Modified: brlcad/trunk/db/Makefile.am
===================================================================
--- brlcad/trunk/db/Makefile.am 2010-11-05 12:36:43 UTC (rev 41251)
+++ brlcad/trunk/db/Makefile.am 2010-11-05 14:08:22 UTC (rev 41252)
@@ -27,9 +27,9 @@
DYLD_LIBRARY_PATH=$(top_builddir)/src/other/tcl/unix:$(top_buildir)/src/other/tk/unix:$$DYLD_LIBRARY_PATH
\
$(A2G) `if test -e operators.asc ; then echo operators.asc ;
else echo $(top_srcdir)/db/operators.asc ; fi` $@ ; \
else \
- $(ECHO) "ls -lad $(A2G)" ; \
- $(ECHO) "`ls -lad $(A2G)`" ; \
- $(ECHO) "$(A2G) does not exist" ; \
+ echo "ls -lad $(A2G)" ; \
+ echo "`ls -lad $(A2G)`" ; \
+ echo "$(A2G) does not exist" ; \
fi
@touch lockfile
Modified: brlcad/trunk/include/conf/Makefile.am
===================================================================
--- brlcad/trunk/include/conf/Makefile.am 2010-11-05 12:36:43 UTC (rev
41251)
+++ brlcad/trunk/include/conf/Makefile.am 2010-11-05 14:08:22 UTC (rev
41252)
@@ -1,22 +1,22 @@
COUNT: DATE HOST PATH USER
- test -f $@ && expr `cat COUNT` + 1 > $@ || $(ECHO) "1" > $@
+ test -f $@ && expr `cat COUNT` + 1 > $@ || echo "1" > $@
DATE: HOST PATH USER $(top_builddir)/include/brlcad_config.h
- $(ECHO) "\"`LANG=C date -R 2>/dev/null || date +'%a, %d %b %Y %H:%M:%S
%z' 2>/dev/null || date`\"" > $@
+ echo "\"`LANG=C date -R 2>/dev/null || date +'%a, %d %b %Y %H:%M:%S %z'
2>/dev/null || date`\"" > $@
HOST: $(top_builddir)/include/brlcad_config.h
- $(ECHO) "\"`hostname`\"" > $@
+ echo "\"`hostname`\"" > $@
PATH: $(top_builddir)/include/brlcad_config.h
- $(ECHO) "\"$(DESTDIR)$(prefix)\"" > $@
+ echo "\"$(DESTDIR)$(prefix)\"" > $@
USER: $(top_builddir)/include/brlcad_config.h
- $(ECHO) "\"`whoami`\"" > $@
+ echo "\"`whoami`\"" > $@
# updated every time make is invoked for timing the compile
TS:
- @$(ECHO) "\"`LANG=C date -R 2>/dev/null || date +'%a, %d %b %Y %H:%M:%S
%z' 2>/dev/null || date`\"" > $@
+ @echo "\"`LANG=C date -R 2>/dev/null || date +'%a, %d %b %Y %H:%M:%S
%z' 2>/dev/null || date`\"" > $@
@cat TS
.PHONY: TS
Modified: brlcad/trunk/src/other/step/include/conf/Makefile.am
===================================================================
--- brlcad/trunk/src/other/step/include/conf/Makefile.am 2010-11-05
12:36:43 UTC (rev 41251)
+++ brlcad/trunk/src/other/step/include/conf/Makefile.am 2010-11-05
14:08:22 UTC (rev 41252)
@@ -1,22 +1,22 @@
COUNT: DATE HOST PATH USER
- test -f $@ && expr `cat COUNT` + 1 > $@ || $(ECHO) "1" > $@
+ test -f $@ && expr `cat COUNT` + 1 > $@ || echo "1" > $@
DATE: HOST PATH USER $(top_builddir)/include/scl_config.h
- $(ECHO) "\"`LANG=C date -R 2>/dev/null || date +'%a, %d %b %Y %H:%M:%S
%z' 2>/dev/null || date`\"" > $@
+ echo "\"`LANG=C date -R 2>/dev/null || date +'%a, %d %b %Y %H:%M:%S %z'
2>/dev/null || date`\"" > $@
HOST: $(top_builddir)/include/scl_config.h
- $(ECHO) "\"`hostname`\"" > $@
+ echo "\"`hostname`\"" > $@
PATH: $(top_builddir)/include/scl_config.h
- $(ECHO) "\"$(DESTDIR)$(prefix)\"" > $@
+ echo "\"$(DESTDIR)$(prefix)\"" > $@
USER: $(top_builddir)/include/scl_config.h
- $(ECHO) "\"`whoami`\"" > $@
+ echo "\"`whoami`\"" > $@
# updated every time make is invoked for timing the compile
TS:
- @$(ECHO) "\"`LANG=C date -R 2>/dev/null || date +'%a, %d %b %Y %H:%M:%S
%z' 2>/dev/null || date`\"" > $@
+ @echo "\"`LANG=C date -R 2>/dev/null || date +'%a, %d %b %Y %H:%M:%S
%z' 2>/dev/null || date`\"" > $@
@cat TS
.PHONY: TS
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
