Index: /trunk/psconfig/INSTALL
===================================================================
--- /trunk/psconfig/INSTALL	(revision 26280)
+++ /trunk/psconfig/INSTALL	(revision 26281)
@@ -77,8 +77,8 @@
 3. Dependencies
 
-NOTE: It is possible to use the tools discussed below to manually check on the
-external dependencies.  However, the psbuild system now allows you to
-build the full suite including dependencies in a single pass.  To use
-this method, skip to section 5.
+NOTE: It is possible to use the tools discussed below to manually
+check on the external dependencies.  However, the psbuild system
+allows you to build the full suite including dependencies in a single
+pass.  To use this method, skip to section 4.
 
 3.1. External C libraries
@@ -88,13 +88,8 @@
 libraries defined by LD_LIBRARY_PATH, and the installation library
 defined by psconfig.  Any missing dependencies will be listed.
-Tarballs for these libraries may be found on the Pan-STARRS web site
-at:
-
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extlibs-2.6.1.tgz
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extperl-2.6.1.tgz
-
-These should be installed so they will be available in the user's
-path.  The psconfig commands can be used to install these libraries in
-the psconfig location:
+Tarballs for these libraries are included in the IPP software
+distribution in the directory 'extlibs'.  The command pschecklibs
+-build can be used to install these libraries in the psconfig
+location.  Note that:
 
 'psautogen' replaces autogen.sh
@@ -106,17 +101,11 @@
 Perl modules, and can be used to install them in the appropriate user
 location in the psconfig system.  The command defaults to the latest
-perl installation table (eg, tagsets/ipp-2.6.1.perl).
+perl installation table (eg, tagsets/ipp-2.9.perl).
 
 pscheckperl
 
-will test for the perl modules specified for the latest ipp release.
-if any modules are missing, they can be download from the Pan-STARRS
-web site:
-
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extperl
-
-The tarballs should be placed in a directory extperl parallel to the
-ipp directory (two levels up from this directory).  If the tarballs
-are in the correct location, they can be built by supplying the -build
+will test for the perl modules specified for the latest IPP release.
+The (known) IPP-required Perl modules are included in the IPP software
+distribution in 'extperl', and can be built by supplying the -build
 flag to pscheckperl:
 
@@ -130,14 +119,8 @@
 psbuild
 
-For additional information on using psbuild, see the listing of
-options below (or type psbuild -help)
-
-5. Single-Pass Build with External Dependencies
-
-If you have not already done so, download the tarball with the
-external libraries and perl modules from:
-
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extlibs-2.6.1.tgz
-http://pan-starrs.ifa.hawaii.edu/project/IPP/software/extperl-2.6.1.tgz
+If you have checked the IPP tree out of our svn repository, certain
+steps are slightly modified.  In this case, it is necessary to add the
+option '-dev'.  For additional information on using psbuild, see the
+listing of options below (or type psbuild -help)
 
 It should be possible to build the full IPP installation by issuing
@@ -145,4 +128,19 @@
 
 psbuild -extbuild
+
+5. Building Magic.
+
+The Magic software, required for processing of PS1/GPC1 data before it
+can be released to the community, is not generally available for
+distribution.  For those without access to this software, the psbuild
+will simply skip the step of building the magic software.  For those
+who have access to this software, it is necessary to install the magic
+source code in the IPP tree before building.  The magic and
+ssa-core-cpp tarballs must be placed in the home directory.  Go to the
+magic directory (cd ../magic) and run the command 'make update'.  This
+will untar the magic code into the local magic directory and install
+an appropriately modified makefile.  Return to this directory and
+follow the build instructions as above.  (NOTE: this step is only
+necessary for a new IPP checkout or a new magic tarball).
 
 ------