loncom/build/Makefile - diff

Return to Makefile CVS log

Up to [LON-CAPA] / loncom / build

Diff for /loncom/build/Makefile between versions 1.192 and 1.194

version 1.192, 2010/11/17 19:35:25	version 1.194, 2011/03/10 16:08:20
Line 154 help_TARGETS:	Line 154 help_TARGETS:
@echo " /home/httpd/html/lon-status/version.txt"	@echo " /home/httpd/html/lon-status/version.txt"
@echo "aboutVERSION: place version information inside about.html"	@echo "aboutVERSION: place version information inside about.html"
@echo " and loncapa_apache.conf"	@echo " and loncapa_apache.conf"
	@echo "postaboutVERSION: restore default version <!-- VERSION --> to"
	@echo " about.html and loncapa_apache.conf"
@echo "*** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***"	@echo "*** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***"
@echo "Makefile.configinstall: generate a Makefile for configuration"	@echo "Makefile.configinstall: generate a Makefile for configuration"
@echo " files; built dynamically from"	@echo " files; built dynamically from"
Line 315 configinstall: Makefile.configinstall	Line 317 configinstall: Makefile.configinstall

install: buildflag VERSION TEST_hosts_tab TEST_domain_tab Makefile.install Makefile	install: buildflag VERSION TEST_hosts_tab TEST_domain_tab Makefile.install Makefile
echo -n "" > WARNINGS	echo -n "" > WARNINGS
	make aboutVERSION
make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" \
directories	directories
make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files	make -f Makefile.install SOURCE="$(SOURCE)" TARGET="$(TARGET)" files
Line 381 tardist:	Line 384 tardist:
else \	else \
ln -s . $(DIRTARGET); \	ln -s . $(DIRTARGET); \
fi	fi
cp -v $(SOURCE)/loncom/license/about.html \
$(SOURCE)/loncom/license/about.html.orig
cp -v $(SOURCE)/loncom/loncapa_apache.conf \
$(SOURCE)/loncom/loncapa_apache.conf.orig
make aboutVERSION	make aboutVERSION
cd $(SOURCE); \	cd $(SOURCE); \
tar --no-recursion --numeric-owner --files-from MANIFEST \	tar --no-recursion --numeric-owner --files-from MANIFEST \
-h -czf $(DIRTARGET).tar.gz 2>tar_WARNINGS \|\| [ "0" == "0" ]	-h -czf $(DIRTARGET).tar.gz 2>tar_WARNINGS \|\| [ "0" == "0" ]
mv -v $(SOURCE)/loncom/license/about.html.orig \	make postaboutVERSION
$(SOURCE)/loncom/license/about.html
mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \
$(SOURCE)/loncom/loncapa_apache.conf
cat $(SOURCE)/tar_WARNINGS \| \	cat $(SOURCE)/tar_WARNINGS \| \
xargs --replace=XXX echo '** WARNING ** XXX' > WARNINGS	xargs --replace=XXX echo '** WARNING ** XXX' > WARNINGS
rm -f $(SOURCE)/tar_WARNINGS	rm -f $(SOURCE)/tar_WARNINGS
Line 517 latex_fmtutil:	Line 513 latex_fmtutil:
tee -a WARNINGS	tee -a WARNINGS

postinstall:	postinstall:
	make postaboutVERSION
make webserverconf	make webserverconf
make reseval_fixup	make reseval_fixup
make clean_file_permissions	make clean_file_permissions
Line 548 VERSION:	Line 545 VERSION:
date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt	date +"%Y%m%d" >> $(TARGET)/home/httpd/html/lon-status/version.txt

aboutVERSION:	aboutVERSION:
	cp -v $(SOURCE)/loncom/license/about.html \
	$(SOURCE)/loncom/license/about.html.orig
	cp -v $(SOURCE)/loncom/loncapa_apache.conf \
	$(SOURCE)/loncom/loncapa_apache.conf.orig
cat $(SOURCE)/loncom/license/about.html \| \	cat $(SOURCE)/loncom/license/about.html \| \
perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(SHOWVERSION)-$$d/; print;}' > \	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>\|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \
$(SOURCE)/loncom/license/about.html.new	$(SOURCE)/loncom/license/about.html.new
mv -v $(SOURCE)/loncom/license/about.html.new \	mv -v $(SOURCE)/loncom/license/about.html.new \
$(SOURCE)/loncom/license/about.html	$(SOURCE)/loncom/license/about.html
cat $(SOURCE)/loncom/loncapa_apache.conf \| \	cat $(SOURCE)/loncom/loncapa_apache.conf \| \
perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/\<\!\-\- VERSION \-\-\>/$(SHOWVERSION)-$$d/; print;}' > \	perl -e '$$d=`date +"%Y%m%d%H"`;chomp($$d);while(<>){s/(\<\!\-\- VERSION \-\-\>\|\d+\.\d+\.CVS_HEAD\-\d{10})/$(SHOWVERSION)-$$d/; print;}' > \
$(SOURCE)/loncom/loncapa_apache.conf.new	$(SOURCE)/loncom/loncapa_apache.conf.new
mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \	mv -v $(SOURCE)/loncom/loncapa_apache.conf.new \
$(SOURCE)/loncom/loncapa_apache.conf	$(SOURCE)/loncom/loncapa_apache.conf

	postaboutVERSION:
	if (test -e $(SOURCE)/loncom/license/about.html.orig) && \
	(diff $(SOURCE)/loncom/license/about.html \
	$(SOURCE)/loncom/license/about.html > /dev/null); then \
	mv -v $(SOURCE)/loncom/license/about.html.orig \
	$(SOURCE)/loncom/license/about.html; \
	elif (test -e $(SOURCE)/loncom/license/about.html.orig) && \
	!(diff $(SOURCE)/loncom/license/about.html \
	$(SOURCE)/loncom/license/about.html > /dev/null); then \
	rm -f $(SOURCE)/loncom/license/about.html.orig; \
	fi
	if (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \
	(diff $(SOURCE)/loncom/license/about.html \
	$(SOURCE)/loncom/license/about.html > /dev/null); then \
	mv -v $(SOURCE)/loncom/loncapa_apache.conf.orig \
	$(SOURCE)/loncom/loncapa_apache.conf; \
	elif (test -e $(SOURCE)/loncom/loncapa_apache.conf.orig) && \
	!(diff $(SOURCE)/loncom/license/about.html \
	$(SOURCE)/loncom/license/about.html > /dev/null); then \
	rm -f $(SOURCE)/loncom/loncapa_apache.conf.orig; \
	fi

# ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***	# ========= *** Makefile.* TARGETS BUILT DYNAMICALLY FROM loncapafiles.lpml ***

Makefile.configinstall: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml \	Makefile.configinstall: $(SOURCE)/doc/loncapafiles/loncapafiles.lpml \

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.192
changed lines
	Added in v.1.194