--- loncom/build/Makefile	2004/05/19 16:05:38	1.158
+++ loncom/build/Makefile	2004/06/08 23:13:22	1.161.2.2
@@ -1,6 +1,6 @@
 # The LearningOnline Network with CAPA
 
-# $Id: Makefile,v 1.158 2004/05/19 16:05:38 matthew Exp $
+# $Id: Makefile,v 1.161.2.2 2004/06/08 23:13:22 albertel Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -10,7 +10,7 @@
 # ======================================= Default settings for Makefile options
 DISTPROBE=`perl ./distprobe`
 DIST=$(DISTPROBE)
-CATEGORY="development"
+CATEGORY="runtime"
 SOURCE=../..
 TARGET=""
 NORESTORECONF="0"
@@ -22,7 +22,7 @@ SAVE=program.pl.$(TIMESTAMP)
 LAUNCHSAVE=$(OUTSTREAM) $(SAVE)
 METAMTARGET=""
 MTARGET=""
-VERSION=CVS_HEAD
+VERSION=1.1.99.0
 # The current working definition for "RELEASE" is: changes not in the software,
 # but in the operating system dependent packaging of the software.  Thus, the
 # generic tarball releases do not need to have a release number specified.
@@ -120,6 +120,7 @@ help_TARGETS:
 	@echo "sanitycheck: probe for common errors and recommend fixes to"
 	@echo "             the user"
 	@echo "ntpcheck: test to see if ntp is installed and running."
+	@echo "rpmcheck: test to see if rpms known to confict are installed."
 	@echo "updatequery: solicit the user for machine configuration"
 	@echo "             information; to be incorporated during an update"
 	@echo "             procedure (via the UPDATE command)"
@@ -387,6 +388,11 @@ ntpcheck:
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
 	tee -a WARNINGS
 
+rpmcheck:
+	cat $(SOURCE)/doc/loncapafiles/rpmcheck.piml | \
+	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
+	tee -a WARNINGS
+
 sanitycheck:
 	cat $(SOURCE)/doc/loncapafiles/sanitycheck.piml | \
 	perl piml_parse.pl $(CATEGORY) $(DIST) "$(TARGET)" $(LAUNCH) | \
@@ -426,6 +432,7 @@ postinstall:
 	make reseval_fixup
 	make accesscount_seed
 	make clearoutoldspreadsheetcache
+	make rpmcheck
 	make ntpcheck
 	make sanitycheck
 	make sendmail_fix