# HG changeset patch
# User jwe
# Date 1057608346 0
# Node ID 9a22062074028f97a250c3f964c089a38beac375
# Parent  aa345723c6986ec8fa0fd9d57d1e78d44257efd6
[project @ 2003-07-07 20:04:53 by jwe]

diff --git a/doc/interpreter/octave-config.1 b/doc/interpreter/octave-config.1
--- a/doc/interpreter/octave-config.1
+++ b/doc/interpreter/octave-config.1
@@ -23,6 +23,30 @@
 .TP 8
 .B \--oct-site-dir
 Display the main directory for local, or site-specific, .oct dynamic-link libraries.
+.TP 8
+.B \-p|\-\-print VAR
+Print the default value of the Octave configuration variable VAR.
+Recognized variables are:
+.RS
+    CANONICAL_HOST_TYPE    LOCALFCNFILEDIR    
+    DEFAULT_PAGER          LOCALFCNFILEPATH
+    ARCHLIBDIR             LOCALOCTFILEDIR
+    BINDIR                 LOCALOCTFILEPATH
+    DATADIR                LOCALSTARTUPFILEDIR
+    EXEC_PREFIX            LOCALVERARCHLIBDIR
+    FCNFILEDIR             LOCALVERFCNFILEDIR
+    FCNFILEPATH            LOCALVEROCTFILEDIR
+    IMAGEDIR               MAN1DIR
+    IMAGEPATH              MAN1EXT
+    INCLUDEDIR             MANDIR
+    INFODIR                OCTFILEDIR
+    INFOFILE               OCTINCLUDEDIR
+    LIBDIR                 OCTLIBDIR
+    LIBEXECDIR             PREFIX
+    LIBEXECDIR             STARTUPFILEDIR
+    LOCALARCHLIBDIR        VERSION
+.RE
+.TP 8
 .B \-v|\-\-version
 Display the version number of 
 .BR octave (1).
diff --git a/octave-config.in b/octave-config.in
--- a/octave-config.in
+++ b/octave-config.in
@@ -56,36 +56,36 @@
 
 Options:
 
-  -h, -?, --help      Print this message.
+  -h, -?, --help        Print this message.
 
-  --m-site-dir        Print the name of the directory where Octave
-                      expects to find locally installed .m files.
+  --m-site-dir          Print the name of the directory where Octave
+                        expects to find locally installed .m files.
 
-  --oct-site-dir      Print the name of the directory where Octave
-                      expects to find locally installed .oct files.
+  --oct-site-dir        Print the name of the directory where Octave
+                        expects to find locally installed .oct files.
 
-  -v, --version       Print the Octave version number.
-
-  --variable VAR      Print the value of the given configuration
-		      variable VAR:
+  -p VAR, --print VAR   Print the value of the given configuration
+		        variable VAR.  Recognized variables are:
 
-			CANONICAL_HOST_TYPE    LOCALFCNFILEDIR    
-			DEFAULT_PAGER	       LOCALFCNFILEPATH
-			ARCHLIBDIR	       LOCALOCTFILEDIR
-			BINDIR		       LOCALOCTFILEPATH
-			DATADIR		       LOCALSTARTUPFILEDIR
-			EXEC_PREFIX	       LOCALVERARCHLIBDIR
-			FCNFILEDIR	       LOCALVERFCNFILEDIR
-			FCNFILEPATH	       LOCALVEROCTFILEDIR
-			IMAGEDIR	       MAN1DIR
-			IMAGEPATH	       MAN1EXT
-			INCLUDEDIR	       MANDIR
-			INFODIR		       OCTFILEDIR
-			INFOFILE	       OCTINCLUDEDIR
-			LIBDIR		       OCTLIBDIR
-			LIBEXECDIR	       PREFIX
-			LIBEXECDIR	       STARTUPFILEDIR
-			LOCALARCHLIBDIR        VERSION
+			  CANONICAL_HOST_TYPE    LOCALFCNFILEDIR    
+			  DEFAULT_PAGER          LOCALFCNFILEPATH
+			  ARCHLIBDIR             LOCALOCTFILEDIR
+			  BINDIR                 LOCALOCTFILEPATH
+			  DATADIR                LOCALSTARTUPFILEDIR
+			  EXEC_PREFIX            LOCALVERARCHLIBDIR
+			  FCNFILEDIR             LOCALVERFCNFILEDIR
+			  FCNFILEPATH            LOCALVEROCTFILEDIR
+			  IMAGEDIR               MAN1DIR
+			  IMAGEPATH              MAN1EXT
+			  INCLUDEDIR             MANDIR
+			  INFODIR                OCTFILEDIR
+			  INFOFILE               OCTINCLUDEDIR
+			  LIBDIR                 OCTLIBDIR
+			  LIBEXECDIR             PREFIX
+			  LIBEXECDIR             STARTUPFILEDIR
+			  LOCALARCHLIBDIR        VERSION
+
+  -v, --version         Print the Octave version number.
 
 EOF
       exit 0
@@ -99,10 +99,11 @@
     -v | --version)
       echo $VERSION
     ;;
-    --variable)
+    -p | --print)
+      opt="$1"
       shift
       if [ $# -eq 0 ]; then
-        echo "octave-config: --version option requires argument" 1>&2
+        echo "octave-config: $opt option requires argument" 1>&2
         exit 1
       fi
       eval echo \${$1}