Install the SQL command man pages into a section appropriate for each

system.  Some systems did not understand the 'l' section, and in general
it wasn't entirely appropriate.

On SCO OpenServer, the man pages won't be installed at all until someone
figures out their man system.

25 files changed, 47 insertions, 10 deletions

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index dc54dcd1e66..9a1aa8c5386 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.135 2001/08/28 14:20:26 petere Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.136 2001/08/29 19:14:39 petere Exp $
 
 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -88,6 +88,7 @@ includedir_server = $(pkgincludedir)/server
 includedir_internal = $(pkgincludedir)/internal
 
 mandir := @mandir@
+sqlmansect_dummy = l
 
 docdir := @docdir@
 ifeq "$(findstring pgsql, $(docdir))" ""
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 7816a6c9689..82679eb65cb 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.92 2001/08/23 23:06:38 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/storage/lmgr/lock.c,v 1.93 2001/08/29 19:14:39 petere Exp $
  *
  * NOTES
  *	  Outside modules can create a lock table and acquire/release
@@ -65,8 +65,6 @@ static char *lock_mode_names[] =
 	"AccessExclusiveLock"
 };
 
-static char *DeadLockMessage = "Deadlock detected.\n\tSee the lock(l) manual page for a possible cause.";
-
 
 #ifdef LOCK_DEBUG
 
@@ -953,7 +951,7 @@ WaitOnLock(LOCKMETHOD lockmethod, LOCKMODE lockmode,
 		 */
 		LOCK_PRINT("WaitOnLock: aborting on lock", lock, lockmode);
 		SpinRelease(lockMethodTable->ctl->masterLock);
-		elog(ERROR, DeadLockMessage);
+		elog(ERROR, "deadlock detected");
 		/* not reached */
 	}
 
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
index a87c34e771f..e1187b30947 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc1/DatabaseMetaData.java
@@ -1196,7 +1196,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
 
   /**
    * What is the maximum number of columns in a table? From the
-   * create_table(l) manual page...
+   * CREATE TABLE reference page...
    *
    * <p>"The new class is created as a heap with no initial data.  A
    * class can have no more than 1600 attributes (realistically,
diff --git a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
index bc47bbde9c1..6acfec1421d 100644
--- a/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
+++ b/src/interfaces/jdbc/org/postgresql/jdbc2/DatabaseMetaData.java
@@ -1196,7 +1196,7 @@ public class DatabaseMetaData implements java.sql.DatabaseMetaData
 
   /**
    * What is the maximum number of columns in a table? From the
-   * create_table(l) manual page...
+   * CREATE TABLE reference page...
    *
    * <p>"The new class is created as a heap with no initial data.  A
    * class can have no more than 1600 attributes (realistically,
diff --git a/src/makefiles/Makefile.aix b/src/makefiles/Makefile.aix
index a9ba100305c..f500a5f09b8 100644
--- a/src/makefiles/Makefile.aix
+++ b/src/makefiles/Makefile.aix
@@ -43,3 +43,5 @@ endif
 %$(DLSUFFIX): %.o %$(EXPSUFF)
 	@echo Making shared library $@ from $*.o, $*$(EXPSUFF) and postgres.imp
 	$(CC) -Wl,-H512 -Wl,-bM:SRE -Wl,-bI:$(top_builddir)/src/backend/$(POSTGRES_IMP) -Wl,-bE:$*$(EXPSUFF) -o $@ $*.o $(LDFLAGS) $(LIBS) $(LDFLAGS_SL)
+
+sqlmansect = 7
diff --git a/src/makefiles/Makefile.beos b/src/makefiles/Makefile.beos
index fa26c993542..7c79bcecd94 100644
--- a/src/makefiles/Makefile.beos
+++ b/src/makefiles/Makefile.beos
@@ -11,3 +11,5 @@ CFLAGS_SL = -fpic -DPIC
 %.so: %.o
 	ln -fs $(top_srcdir)/src/backend/postgres _APP_
 	$(CC) -nostart -Xlinker -soname=$@ -o $@ _APP_ $<
+
+sqlmansect = 7
diff --git a/src/makefiles/Makefile.bsdi b/src/makefiles/Makefile.bsdi
index 901e210fbb6..95eb123841f 100644
--- a/src/makefiles/Makefile.bsdi
+++ b/src/makefiles/Makefile.bsdi
@@ -22,3 +22,5 @@ endif
 
 %.so: %.o
 	$(CC) -shared -o $@ $<
+
+sqlmansect = 7
diff --git a/src/makefiles/Makefile.darwin b/src/makefiles/Makefile.darwin
index cfeba7f922f..b6619165b0c 100644
--- a/src/makefiles/Makefile.darwin
+++ b/src/makefiles/Makefile.darwin
@@ -6,3 +6,5 @@ CFLAGS_SL = -bundle -undefined suppress
  
 %.so: %.o
 	$(CC) $(CFLAGS) $(CFLAGS_SL) -o $@ $<
+
+sqlmansect = 7
diff --git a/src/makefiles/Makefile.dgux b/src/makefiles/Makefile.dgux
index c88ee14e0ea..f9519632a20 100644
--- a/src/makefiles/Makefile.dgux
+++ b/src/makefiles/Makefile.dgux
@@ -4,3 +4,5 @@ CFLAGS_SL = -fpic
 
 %.so: %.o
 	$(CC) -shared -o $@ $<
+
+sqlmansect = 5
diff --git a/src/makefiles/Makefile.freebsd b/src/makefiles/Makefile.freebsd
index 9f270c37fad..90543b7016a 100644
--- a/src/makefiles/Makefile.freebsd
+++ b/src/makefiles/Makefile.freebsd
@@ -21,3 +21,5 @@ else
 	@rm -f $@
 	$(LD) -x -Bshareable -Bforcearchive -o $@ $@.pic
 endif
+
+sqlmansect = 7
diff --git a/src/makefiles/Makefile.hpux b/src/makefiles/Makefile.hpux
index 1ed5130af08..cfdbee114b9 100644
--- a/src/makefiles/Makefile.hpux
+++ b/src/makefiles/Makefile.hpux
@@ -52,3 +52,5 @@ endif
 # shlib ... should go away, since this is not really enough knowledge)
 %.sl: %.o
 	$(LD) -b -o $@ $<
+
+sqlmansect = 5
diff --git a/src/makefiles/Makefile.irix5 b/src/makefiles/Makefile.irix5
index d90fcd9a6eb..4062161d9ef 100644
--- a/src/makefiles/Makefile.irix5
+++ b/src/makefiles/Makefile.irix5
@@ -16,3 +16,5 @@ ifneq ($(GCC), yes)
 CFLAGS += -woff 1164,1171,1185,1195,1552
 endif
 LDFLAGS += -Wl,-woff,15 -Wl,-woff,84
+
+sqlmansect = 5sql
diff --git a/src/makefiles/Makefile.linux b/src/makefiles/Makefile.linux
index 31277151c96..2b204f9d853 100644
--- a/src/makefiles/Makefile.linux
+++ b/src/makefiles/Makefile.linux
@@ -8,3 +8,5 @@ CFLAGS_SL = -fpic
 
 %.so: %.o
 	$(CC) -shared -o $@ $<
+
+sqlmansect = 7
diff --git a/src/makefiles/Makefile.netbsd b/src/makefiles/Makefile.netbsd
index bcba61732fb..59ab7a791fd 100644
--- a/src/makefiles/Makefile.netbsd
+++ b/src/makefiles/Makefile.netbsd
@@ -24,3 +24,5 @@ else
 	$(LD) -x -Bshareable -Bforcearchive \
 	  -o $@ $@.pic
 endif
+
+sqlmansect = 7
diff --git a/src/makefiles/Makefile.openbsd b/src/makefiles/Makefile.openbsd
index fbcc2e2e4bd..3709d24bdc2 100644
--- a/src/makefiles/Makefile.openbsd
+++ b/src/makefiles/Makefile.openbsd
@@ -22,3 +22,5 @@ else
 	$(LD) -x -Bshareable -Bforcearchive \
 	  -o $@ $@.pic
 endif
+
+sqlmansect = 7
diff --git a/src/makefiles/Makefile.osf b/src/makefiles/Makefile.osf
index 2bf0cfe249e..4ee46ccd756 100644
--- a/src/makefiles/Makefile.osf
+++ b/src/makefiles/Makefile.osf
@@ -5,3 +5,5 @@ rpath = -rpath $(libdir)
 
 %.so: %.o
 	$(LD) -shared -expect_unresolved '*' -o $@ $<
+
+sqlmansect = 5
diff --git a/src/makefiles/Makefile.qnx4 b/src/makefiles/Makefile.qnx4
index 2fb9d7bd193..23364955ed2 100644
--- a/src/makefiles/Makefile.qnx4
+++ b/src/makefiles/Makefile.qnx4
@@ -15,3 +15,5 @@ CFLAGS_SL =
 
 override CXXFLAGS +=-I/usr/local/include/g++
 override CFLAGS +=-I/usr/local/include
+
+sqlmansect = 7
diff --git a/src/makefiles/Makefile.sco b/src/makefiles/Makefile.sco
index a2fedb22f0d..4cd2bcfe2f3 100644
--- a/src/makefiles/Makefile.sco
+++ b/src/makefiles/Makefile.sco
@@ -16,3 +16,4 @@ endif
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
+sqlmansect = 7
diff --git a/src/makefiles/Makefile.solaris b/src/makefiles/Makefile.solaris
index 56fb5c5f058..4425bc45b35 100644
--- a/src/makefiles/Makefile.solaris
+++ b/src/makefiles/Makefile.solaris
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.6 2000/12/16 18:14:25 petere Exp $
+# $Header: /cvsroot/pgsql/src/makefiles/Makefile.solaris,v 1.7 2001/08/29 19:14:40 petere Exp $
 
 AROPT = crs
 
@@ -24,3 +24,5 @@ endif
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
+
+sqlmansect = 5sql
diff --git a/src/makefiles/Makefile.sunos4 b/src/makefiles/Makefile.sunos4
index c45f44d0998..f9e9fc63d90 100644
--- a/src/makefiles/Makefile.sunos4
+++ b/src/makefiles/Makefile.sunos4
@@ -15,3 +15,4 @@ endif
 %.so: %.o
 	$(LD) -assert pure-text -Bdynamic -o $@ $<
 
+sqlmansect = 7
diff --git a/src/makefiles/Makefile.svr4 b/src/makefiles/Makefile.svr4
index 9704f1a1d64..7a01c5c944e 100644
--- a/src/makefiles/Makefile.svr4
+++ b/src/makefiles/Makefile.svr4
@@ -10,3 +10,5 @@ CFLAGS_SL =
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
+
+sqlmansect = 5
diff --git a/src/makefiles/Makefile.ultrix4 b/src/makefiles/Makefile.ultrix4
index 1c03737756f..e9acbc8d462 100644
--- a/src/makefiles/Makefile.ultrix4
+++ b/src/makefiles/Makefile.ultrix4
@@ -8,3 +8,5 @@ CFLAGS_SL = -G 0
 
 %.so: %.c
 	$(CC) -c -G 0 $(CPPFLAGS) $(CFLAGS) -o $@ $<
+
+sqlmansect = 7
diff --git a/src/makefiles/Makefile.univel b/src/makefiles/Makefile.univel
index f91cf357e73..41e64616ef2 100644
--- a/src/makefiles/Makefile.univel
+++ b/src/makefiles/Makefile.univel
@@ -6,4 +6,4 @@ CFLAGS_SL = -K PIC
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
 
-INSTALL= /usr/ucb/install
+sqlmansect = 5
diff --git a/src/makefiles/Makefile.unixware b/src/makefiles/Makefile.unixware
index bc2ddcad36d..0a437c9b0c3 100644
--- a/src/makefiles/Makefile.unixware
+++ b/src/makefiles/Makefile.unixware
@@ -19,3 +19,5 @@ endif
 
 %.so: %.o
 	$(LD) -G -Bdynamic -o $@ $<
+
+sqlmansect = 5sql
diff --git a/src/makefiles/Makefile.win b/src/makefiles/Makefile.win
index 7fce66b1ace..cca9bcbbe0f 100644
--- a/src/makefiles/Makefile.win
+++ b/src/makefiles/Makefile.win
@@ -1,4 +1,4 @@
-# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.13 2001/05/25 15:48:33 momjian Exp $
+# $Header: /cvsroot/pgsql/src/makefiles/Attic/Makefile.win,v 1.14 2001/08/29 19:14:40 petere Exp $
 LDFLAGS+= -g
 DLLTOOL= dlltool
 DLLWRAP= dllwrap
@@ -33,3 +33,5 @@ override CPPFLAGS+= -DUSE_DL_IMPORT
 endif
 
 override javadir := '$(shell cygpath -w $(javadir))'
+
+sqlmansect = 7