[WWcvs] webwork2: 1.

[Arnie P. v. a. <we...@ma...>]

Log Message:
-----------
1. Make the default locations of CAPA resources match the set up instructions
2. Add paths to library macros so that various collections of problems work OK

Tags:
----
rel-2-4-patches

Modified Files:
--------------
    webwork2/conf:
        global.conf.dist

Revision Data
-------------
Index: global.conf.dist
===================================================================
RCS file: /webwork/cvs/system/webwork2/conf/global.conf.dist,v
retrieving revision 1.189.2.7.2.13
retrieving revision 1.189.2.7.2.14
diff -Lconf/global.conf.dist -Lconf/global.conf.dist -u -r1.189.2.7.2.13 -r1.189.2.7.2.14
--- conf/global.conf.dist
+++ conf/global.conf.dist
@@ -857,10 +857,14 @@
    ".",                     # search the problem file's directory
    $courseDirs{macros},
    $pg{directories}{macros},
-   "$courseDirs{templates}/Library/macros/Dartmouth",
    "$courseDirs{templates}/Library/macros/Union",
-   "$courseDirs{templates}/Library/macros/NAU",
+   "$courseDirs{templates}/Library/macros/HughesHallett",
    "$courseDirs{templates}/Library/macros/Michigan",
+   "$courseDirs{templates}/Library/macros/CollegeOfIdaho",
+   "$courseDirs{templates}/Library/macros/FortLewis",
+   "$courseDirs{templates}/Library/macros/TCNJ",
+   "$courseDirs{templates}/Library/macros/NAU",
+   "$courseDirs{templates}/Library/macros/Dartmouth",
 ];
 
 # The applet search path. If a full URL is given, it is used unmodified. If an
@@ -886,10 +890,10 @@
 
 # Locations of CAPA resources. (Only necessary if you need to use converted CAPA
 # problems.)
-$pg{specialPGEnvironmentVars}{CAPA_Tools}             = "$courseDirs{macros}/CAPA_Tools/", 
-$pg{specialPGEnvironmentVars}{CAPA_MCTools}           = "$courseDirs{macros}/CAPA_MCTools/",  
-$pg{specialPGEnvironmentVars}{CAPA_GraphicsDirectory} = "$courseDirs{html}/CAPA_Graphics/", 
-$pg{specialPGEnvironmentVars}{CAPA_Graphics_URL}      = "$courseURLs{html}/CAPA_Graphics/",   
+$pg{specialPGEnvironmentVars}{CAPA_Tools}             = "/opt/webwork/CAPA/CAPA_Tools/",
+$pg{specialPGEnvironmentVars}{CAPA_MCTools}           = "/opt/webwork/CAPA/CAPA_MCTools/",
+$pg{specialPGEnvironmentVars}{CAPA_GraphicsDirectory} = "$webworkDirs{htdocs}/CAPA_Graphics/",
+$pg{specialPGEnvironmentVars}{CAPA_Graphics_URL}      = "$webworkURLs{htdocs}/CAPA_Graphics/",
 
 # Size in pixels of dynamically-generated images, i.e. graphs.
 $pg{specialPGEnvironmentVars}{onTheFlyImageSize}      = 400,