Index: octave-config.in
===================================================================
RCS file: /cvs/octave/octave-config.in,v
retrieving revision 1.6
diff -u -r1.6 octave-config.in
--- octave-config.in	26 Nov 2003 14:42:52 -0000	1.6
+++ octave-config.in	9 Jul 2006 19:01:40 -0000
@@ -13,9 +13,7 @@
 DATADIR="%OCTAVE_DATADIR%"
 EXEC_PREFIX="%OCTAVE_EXEC_PREFIX%"
 FCNFILEDIR="%OCTAVE_FCNFILEDIR%"
-FCNFILEPATH="%OCTAVE_FCNFILEPATH%"
 IMAGEDIR="%OCTAVE_IMAGEDIR%"
-IMAGEPATH="%OCTAVE_IMAGEPATH%"
 INCLUDEDIR="%OCTAVE_INCLUDEDIR%"
 INFODIR="%OCTAVE_INFODIR%"
 INFOFILE="%OCTAVE_INFOFILE%"
@@ -26,9 +24,7 @@
 LOCALAPIOCTFILEDIR="%OCTAVE_LOCALAPIOCTFILEDIR%"
 LOCALARCHLIBDIR="%OCTAVE_LOCALARCHLIBDIR%"
 LOCALFCNFILEDIR="%OCTAVE_LOCALFCNFILEDIR%"
-LOCALFCNFILEPATH="%OCTAVE_LOCALFCNFILEPATH%"
 LOCALOCTFILEDIR="%OCTAVE_LOCALOCTFILEDIR%"
-LOCALOCTFILEPATH="%OCTAVE_LOCALOCTFILEPATH%"
 LOCALSTARTUPFILEDIR="%OCTAVE_LOCALSTARTUPFILEDIR%"
 LOCALVERARCHLIBDIR="%OCTAVE_LOCALVERARCHLIBDIR%"
 LOCALVERFCNFILEDIR="%OCTAVE_LOCALVERFCNFILEDIR%"
@@ -70,25 +66,23 @@
   -p VAR, --print VAR   Print the value of the given configuration
 		        variable VAR.  Recognized variables are:
 
-                          API_VERSION            LOCALARCHLIBDIR
-                          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
-                          LOCALAPIFCNFILEDIR     VERSION
-                          LOCALAPIOCTFILEDIR
+			  API_VERSION	         LOCALAPIFCNFILEDIR
+			  CANONICAL_HOST_TYPE	 LOCALAPIOCTFILEDIR
+			  DEFAULT_PAGER	         LOCALARCHLIBDIR
+			  ARCHLIBDIR	         LOCALFCNFILEDIR
+			  BINDIR	         LOCALOCTFILEDIR
+			  DATADIR	         LOCALSTARTUPFILEDIR
+			  EXEC_PREFIX	         LOCALVERARCHLIBDIR
+			  FCNFILEDIR	         LOCALVERFCNFILEDIR
+			  LOCALVEROCTFILEDIR	 MAN1DIR
+			  IMAGEDIR	         MANDIR
+			  MAN1EXT	         OCTFILEDIR
+			  INCLUDEDIR	         OCTINCLUDEDIR
+			  INFODIR	         OCTLIBDIR
+			  INFOFILE	         PREFIX
+			  LIBDIR	         STARTUPFILEDIR
+			  LIBEXECDIR	         VERSION
+			  LIBEXECDIR	
 
   -v, --version         Print the Octave version number.