[LON-CAPA-cvs] cvs: loncom /build Makefile

harris41 lon-capa-cvs@mail.lon-capa.org
Thu, 09 May 2002 04:58:03 -0000


harris41		Thu May  9 00:58:03 2002 EDT

  Modified files:              
    /loncom/build	Makefile 
  Log:
  BUG 419; fix
  also a few other minor touch-ups
  
  
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.104 loncom/build/Makefile:1.105
--- loncom/build/Makefile:1.104	Wed May  8 22:14:37 2002
+++ loncom/build/Makefile	Thu May  9 00:58:03 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 
 # Scott Harrison
-# $Id: Makefile,v 1.104 2002/05/09 02:14:37 harris41 Exp $
+# $Id: Makefile,v 1.105 2002/05/09 04:58:03 harris41 Exp $
 
 DISTPROBE=`perl ./distprobe`
 DIST=$(DISTPROBE)
@@ -19,10 +19,10 @@
 MTARGET=""
 VERSION=0.1
 
-help: 
+help:
 	@echo "*** You need to specify a valid target ***"
 	@echo "NOTE: You can specify options to your Makefile target."
-	@echo "(option) DIST can be redhat7.1, debian, redhat6.2, or default"
+	@echo "(option) DIST can be redhat7, debian, redhat6.2, or default"
 	@echo "(option) CATEGORY can be runtime or development"
 	@echo "(option) SOURCE is an absolute or relative directory path"
 	@echo "(option) TARGET is an absolute or relative directory path"
@@ -422,6 +422,7 @@
 	echo 'UPDATE' >> $(SOURCE)/MANIFEST
 	echo 'TEST' >> $(SOURCE)/MANIFEST
 	echo 'CHECKRPMS' >> $(SOURCE)/MANIFEST
+	# ---------------------------------- might as well include the MANIFEST
 	echo 'MANIFEST' >> $(SOURCE)/MANIFEST
 	# ------------------------------------------ hosts.tab are belong to us
 	echo 'loncom/rawhide_hosts.tab' >> $(SOURCE)/MANIFEST
@@ -435,6 +436,8 @@
 	echo 'doc/scripts' >> $(SOURCE)/MANIFEST
 	# --------------------------- Point UPDATE to the internal make process
 	echo '#!/bin/sh' > $(SOURCE)/UPDATE
+	echo 'touch loncom/build/WARNINGS' >> $(SOURCE)/UPDATE;
+	echo 'ln -s loncom/build/WARNINGS WARNINGS' >> $(SOURCE)/UPDATE;
 	echo 'cd loncom/build; make build; make install' >> $(SOURCE)/UPDATE
 	# ----------------------------- Point TEST to the internal make process
 	echo '#!/bin/sh' > $(SOURCE)/TEST
@@ -462,6 +465,7 @@
 	else \
 		ln -s . $(DIRTARGET); \
 	fi
+	cd $(SOURCE); \
 	tar --no-recursion --numeric-owner --files-from MANIFEST_loncapa \
 	-h -czf loncapa.tar.gz 2>WARNINGS || [ "0" == "0" ]
 	cat $(SOURCE)/WARNINGS | \
@@ -473,6 +477,8 @@
 	rm -f $(SOURCE)/README
 	rm -f $(SOURCE)/UPDATE
 	rm -f $(SOURCE)/TEST
+	rm -f $(SOURCE)/MANIFEST
+	rm -f $(SOURCE)/loncapa
 	rm -f $(SOURCE)/loncapa.tar.gz
 	rm -Rf HTML
 	rm -f installation_manual.pdf