From 97b2dde86c9495f8d9035d60012d2105f99d4550 Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Tue, 21 Jun 2005 15:32:55 +0000
Subject: [PATCH] Add details for new RPM macros (match new rpm logic for AIX).

---
 doc/html/quickstart_admin.html | 55 +++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 10 deletions(-)

diff --git a/doc/html/quickstart_admin.html b/doc/html/quickstart_admin.html
index 30caa6a617d..c2ee1211c0a 100644
--- a/doc/html/quickstart_admin.html
+++ b/doc/html/quickstart_admin.html
@@ -9,7 +9,7 @@
 <meta http-equiv="keywords" content="Simple Linux Utility for Resource Management, SLURM, resource management, 
 Linux clusters, high-performance computing, Livermore Computing">
 <meta name="LLNLRandR" content="UCRL-WEB-209488">
-<meta name="LLNLRandRdate" content="19 May 2005">
+<meta name="LLNLRandRdate" content="21 June 2005">
 <meta name="distribution" content="global">
 <meta name="description" content="Simple Linux Utility for Resource Management">
 <meta name="copyright"
@@ -59,11 +59,6 @@ overview.
  
 <h3>Building and Installing</h3>
 
-<p>To build RPMs directoy, copy the distribued tar-ball into the directory
-<b>/usr/src/redhat/SOURCES</b> and execute a command of this sort (substitute 
-the appropriate SLURM version number):<br>
-<span class="commandline">rpmbuild -ta slurm-0.5.0-1.tgz</span> </p>
-
 <p>Instructions to build and install SLURM manually are shown below. 
 See the README and INSTALL files in the source distribution for more details.
 </p>
@@ -80,13 +75,14 @@ documentation, libaries, header files, etc.</li>
 <p>The most commonly used arguments to the <span class="commandline">configure</span> 
 command include: </p>
 <p style="margin-left:.2in"><span class="commandline">--enable-debug</span><br>
-Enable debugging of individual modules.</p>
+Enable additional debugging logic within SLURM.</p>
 <p style="margin-left:.2in"><span class="commandline">--prefix=<i>PREFIX</i></span><br>
 </i> 
 Install architecture-independent files in PREFIX; default value is /usr/local.</p>
 <p style="margin-left:.2in"><span class="commandline">--sysconfdir=<i>DIR</i></span><br>
 </i> 
-Specify location of SLURM configuration file.</p>
+Specify location of SLURM configuration file. </p>
+
 <p>Optional SLURM plugins will be built automatically when the
 <span class="commandline">configure</span> script detects that the required 
 build requirements are present. Build dependencies for various plugins
@@ -109,7 +105,46 @@ are denoted below.
 		  package for more details)
 </ul>
 Please see the <a href=download.html>Download</a> page for references to
-required software to build these plugins.
+required software to build these plugins.</p>
+
+<p>To build RPMs directly, copy the distribued tar-ball into the directory
+<b>/usr/src/redhat/SOURCES</b> and execute a command of this sort (substitute
+the appropriate SLURM version number):<br>
+<span class="commandline">rpmbuild -ta slurm-0.5.0-1.tgz</span></p>
+
+<p>You can control some aspects of the RPM built with a <i>.rpmmacros</i>
+file in your home directory. <b>Special macro definitions will likely 
+only be required if files are installed in unconventional locations.</b>
+Some macro definitions that may be used in building SLURM include:
+<dl>
+<dt>_enable_debug
+<dd>Specify if debugging logic within SLURM is to be enabled
+<dt>_prefix
+<dd>Pathname of directory to contain the SLURM files
+<dt>_sysconfdir
+<dd>Pathname of directory containing the slurm.conf configuration file
+<dt>with_munge
+<dd>Specifies munge (authentication library) installation location
+<dt>with_proctrack
+<dd>Specifies AIX process tracking kernel extention header file location
+<dt>with_ssl
+<dd>Specifies SSL libary installation location
+</dl>
+To build SLURM on our AIX system, the following .rpmmacros file is used:
+<pre>
+# .rpmmacros
+# For AIX at LLNL
+# Override some RPM macros from /usr/lib/rpm/macros
+# Set other SLURM-specific macros for unconventional file locations
+#
+%_enable_debug     "--with-debug"
+%_prefix           /admin/llnl
+%_sysconfdir       %{_prefix}/etc/slurm
+%with_munge        "--with-munge=/admin/llnl"
+%with_proctrack    "--with-proctrack=/admin/llnl/include"
+%with_ssl          "--with-ssl=/opt/freeware"
+</pre></p>
+
 <p class="footer"><a href="#top">top</a></p>
 
 <h3>Daemons</h3>
@@ -490,7 +525,7 @@ in the NEWS file.
 <td colspan="3"><hr> <p>For information about this page, contact <a href="mailto:slurm-dev@lists.llnl.gov">slurm-dev@lists.llnl.gov</a>.</p>
 <p><a href="http://www.llnl.gov/"><img align=middle src="lll.gif" width="32" height="32" border="0"></a></p>
 <p class="footer">UCRL-WEB-209488<br>
-Last modified 19 May 2005</p></td>
+Last modified 21 June 2005</p></td>
 </tr>
 </table>
 </td>
-- 
GitLab