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

harris41 lon-capa-cvs@mail.lon-capa.org
Mon, 13 May 2002 17:35:20 -0000


harris41		Mon May 13 13:35:20 2002 EDT

  Modified files:              
    /loncom/build	Makefile 
  Log:
  make sure that files attempt to install off the tarball irrespective of
  status of build (eventually we either distribute precompiled builds
  or have some sort of interactive pause that tells the user about the build
  BUG 431  (the problem was that make build; make install... introduces
  a serial dependency whereas splitting them onto two different lines
  removes that dependency)
  
  
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.109 loncom/build/Makefile:1.110
--- loncom/build/Makefile:1.109	Mon May 13 05:24:52 2002
+++ loncom/build/Makefile	Mon May 13 13:35:20 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 
 # Scott Harrison
-# $Id: Makefile,v 1.109 2002/05/13 09:24:52 harris41 Exp $
+# $Id: Makefile,v 1.110 2002/05/13 17:35:20 harris41 Exp $
 
 DISTPROBE=`perl ./distprobe`
 DIST=$(DISTPROBE)
@@ -439,7 +439,8 @@
 	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
+	echo 'cd loncom/build; make build' >> $(SOURCE)/UPDATE
+	echo 'make install' >> $(SOURCE)/UPDATE
 	echo 'make updatequery' >> $(SOURCE)/UPDATE
 	echo 'make hosts_tab' >> $(SOURCE)/UPDATE
 	# ----------------------------- Point TEST to the internal make process