--- loncom/build/Makefile 2011/03/24 02:04:46 1.196 +++ loncom/build/Makefile 2011/11/08 07:40:04 1.199 @@ -1,6 +1,6 @@ # The LearningOnline Network with CAPA -# $Id: Makefile,v 1.196 2011/03/24 02:04:46 raeburn Exp $ +# $Id: Makefile,v 1.199 2011/11/08 07:40:04 raeburn Exp $ # TYPICAL USAGE of this Makefile is primarily for two targets: # "make build" and "make install". @@ -13,6 +13,10 @@ DIST=$(DISTPROBE) CATEGORY="development" SOURCE=../.. TARGET="" +CURRSHELL=`echo $(SHELL)` +ifneq ('/bin/bash',${CURRSHELL}) +CURRSHELL=/bin/bash +endif NORESTORECONF="0" HOSTNAME="" LAUNCH=| perl @@ -132,6 +136,7 @@ help_TARGETS: @echo " nohist_reseval.db to nohist_accesscount.db." @echo "modify_config_files: Perform automatic update of the " @echo " configuration files for yum and MySQL." + @echo "langcheck: test to see if root bash and OS are using English." @echo "ntpcheck: test to see if ntp is installed and running." @echo "html_parser_check: test functionality of HTML::Parser." @echo "math_random_check: test functionality of Math::Random." @@ -394,6 +399,11 @@ tardist: rm -f $(SOURCE)/tar_WARNINGS make warningnote +langcheck: + cat $(SOURCE)/doc/loncapafiles/langcheck.piml | \ + perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ + tee -a WARNINGS + ntpcheck: cat $(SOURCE)/doc/loncapafiles/ntpcheck.piml | \ perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \ @@ -521,6 +531,7 @@ postinstall: make update_queue_slots make modify_config_files make clearoutoldspreadsheetcache + make langcheck make chkconfig make rpmcheck make ntpcheck @@ -593,7 +604,7 @@ Makefile.configinstall: $(SOURCE)/doc/lo Makefile.build: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \ perl lpml_parse.pl build $(CATEGORY) $(DIST) "$(SOURCE)" "$(TARGET)" \ - > Makefile.build + "$(CURRSHELL)" > Makefile.build Makefile.install: alwaysrun cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \