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

harris41 lon-capa-cvs@mail.lon-capa.org
Wed, 14 Aug 2002 18:31:43 -0000


harris41		Wed Aug 14 14:31:43 2002 EDT

  Modified files:              
    /loncom/build	Makefile 
  Log:
  making sure we find system_dependencies directory inside ./TEST command
  
  
Index: loncom/build/Makefile
diff -u loncom/build/Makefile:1.131 loncom/build/Makefile:1.132
--- loncom/build/Makefile:1.131	Wed Aug 14 13:15:53 2002
+++ loncom/build/Makefile	Wed Aug 14 14:31:43 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 
 # Scott Harrison, your friendly neighborhood volunteer
-# $Id: Makefile,v 1.131 2002/08/14 17:15:53 harris41 Exp $
+# $Id: Makefile,v 1.132 2002/08/14 18:31:43 harris41 Exp $
 
 # TYPICAL USAGE of this Makefile is primarily for two targets:
 # "make build" and "make install".
@@ -307,7 +307,7 @@
 	# ----------------------------- Point TEST to the internal make process
 	echo '#!/bin/sh' > $(SOURCE)/TEST
 	echo 'cd loncom/build; make test' >> $(SOURCE)/TEST
-	echo 'cd loncom/build/system_dependencies; cp -v CPAN_STATUS_REPORT ../../../CPAN_STATUS_REPORT' >> $(SOURCE)/TEST
+	echo 'cd system_dependencies || cd loncom/build/system_dependencies; cp -v CPAN_STATUS_REPORT ../../../CPAN_STATUS_REPORT' >> $(SOURCE)/TEST
 	# ----------------------------- Copy CHECKRPMS to the vanilla top-level
 	cp -v $(SOURCE)/loncom/build/CHECKRPMS $(SOURCE)/CHECKRPMS
 	# ----------------------- vanilla executables must indeed be executable