--- loncom/build/Makefile 2002/05/22 20:28:46 1.114 +++ loncom/build/Makefile 2002/05/30 17:34:23 1.118 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Scott Harrison -# $Id: Makefile,v 1.114 2002/05/22 20:28:46 harris41 Exp $ +# $Id: Makefile,v 1.118 2002/05/30 17:34:23 harris41 Exp $ DISTPROBE=`perl ./distprobe` DIST=$(DISTPROBE) @@ -213,6 +213,10 @@ postinstall: make webserverconf make sanitycheck +NET_rawinstall: + make TIMESTAMP=`date +"%s"` METAMTARGET="TRANSPORT" \ + MTARGET="rawinstall" HOSTNAME="$(HOSTNAME)" lpmladm + install: TEST_hosts_tab Makefile.install Makefile echo -n "" > WARNINGS make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \ @@ -224,6 +228,10 @@ install: TEST_hosts_tab Makefile.install make postinstall make warningnote echo "You can run 'make test' to see if your system is ready to go!" + echo "NOTE THAT YOUR SYSTEM MUST HAVE MYSQL WITH A USER=\"www\" AND" + echo -n "PASSWORD=\"localhostkey\" FOR www\@localhost" + echo -n "(YOU MAY NEED TO REINITIALIZE YOUR MYSQL www\@localhost USER)" + echo -n "Please see http://install.lon-capa.org/ for more information" rawinstall: Makefile.install Makefile echo -n "" > WARNINGS @@ -234,7 +242,7 @@ rawinstall: Makefile.install Makefile make SOURCE="$(SOURCE)" TARGET="$(TARGET)" \ NORESTORECONF="$(NORESTORECONF)" configinstall -Makefile.install: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml lpml_parse.pl +Makefile.install: alwaysrun cat $(SOURCE)/doc/loncapafiles/loncapafiles.lpml | \ perl lpml_parse.pl install $(CATEGORY) $(DIST) "$(SOURCE)" \ "$(TARGET)" > Makefile.install @@ -449,6 +457,7 @@ tardist: echo 'ln -s loncom/build/WARNINGS WARNINGS' >> $(SOURCE)/UPDATE; echo 'cd loncom/build; make build' >> $(SOURCE)/UPDATE echo 'make rawinstall' >> $(SOURCE)/UPDATE + echo 'make configinstall' >> $(SOURCE)/UPDATE echo 'make updatequery' >> $(SOURCE)/UPDATE echo 'make hosts_tab' >> $(SOURCE)/UPDATE echo 'make postinstall' >> $(SOURCE)/UPDATE @@ -533,3 +542,5 @@ reallyclean: rm -Rf lpmladm.* make -f Makefile.cvs clean rm -f WARNINGS + +alwaysrun: