aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure2
-rw-r--r--configure.in4
-rw-r--r--src/Makefile.shlib4
-rw-r--r--src/backend/port/dynloader/irix.c (renamed from src/backend/port/dynloader/irix5.c)2
-rw-r--r--src/backend/port/dynloader/irix.h (renamed from src/backend/port/dynloader/irix5.h)6
-rw-r--r--src/makefiles/Makefile.irix (renamed from src/makefiles/Makefile.irix5)0
-rw-r--r--src/template/irix (renamed from src/template/irix5)0
7 files changed, 9 insertions, 9 deletions
diff --git a/configure b/configure
index 80fa0952bc7..1ac7abc2136 100755
--- a/configure
+++ b/configure
@@ -1389,7 +1389,7 @@ case $host_os in
dgux*) template=dgux ;;
freebsd*) template=freebsd ;;
hpux*) template=hpux ;;
- irix*) template=irix5 ;;
+ irix*) template=irix ;;
linux*) template=linux ;;
mingw*) template=win32 ;;
netbsd*) template=netbsd ;;
diff --git a/configure.in b/configure.in
index 10f4e27f185..ef5d175da8f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.351 2004/05/18 04:11:29 momjian Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.352 2004/05/19 21:37:42 momjian Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
@@ -56,7 +56,7 @@ case $host_os in
dgux*) template=dgux ;;
freebsd*) template=freebsd ;;
hpux*) template=hpux ;;
- irix*) template=irix5 ;;
+ irix*) template=irix ;;
linux*) template=linux ;;
mingw*) template=win32 ;;
netbsd*) template=netbsd ;;
diff --git a/src/Makefile.shlib b/src/Makefile.shlib
index 0414398d89c..300d8854470 100644
--- a/src/Makefile.shlib
+++ b/src/Makefile.shlib
@@ -6,7 +6,7 @@
# Copyright (c) 1998, Regents of the University of California
#
# IDENTIFICATION
-# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.75 2004/05/12 21:56:27 momjian Exp $
+# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.76 2004/05/19 21:37:43 momjian Exp $
#
#-------------------------------------------------------------------------
@@ -139,7 +139,7 @@ ifeq ($(PORTNAME), hpux)
endif
endif
-ifeq ($(PORTNAME), irix5)
+ifeq ($(PORTNAME), irix)
shlib := lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION)
LINK.shared = $(COMPILER) -shared -Wl,-set_version,sgi$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)
endif
diff --git a/src/backend/port/dynloader/irix5.c b/src/backend/port/dynloader/irix.c
index a8e7f971959..d5a654b0cfe 100644
--- a/src/backend/port/dynloader/irix5.c
+++ b/src/backend/port/dynloader/irix.c
@@ -1,4 +1,4 @@
/* Dummy file used for nothing at this point
*
- * see irix5.h
+ * see irix.h
*/
diff --git a/src/backend/port/dynloader/irix5.h b/src/backend/port/dynloader/irix.h
index c642f5db9d3..c49418dcfc8 100644
--- a/src/backend/port/dynloader/irix5.h
+++ b/src/backend/port/dynloader/irix.h
@@ -1,13 +1,13 @@
/*-------------------------------------------------------------------------
*
- * irix5.h
- * port-specific prototypes for Irix 5
+ * irix.h
+ * port-specific prototypes for Irix
*
*
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $PostgreSQL: pgsql/src/backend/port/dynloader/irix5.h,v 1.15 2003/11/29 22:39:55 pgsql Exp $
+ * $PostgreSQL: pgsql/src/backend/port/dynloader/irix.h,v 1.1 2004/05/19 21:37:43 momjian Exp $
*
*-------------------------------------------------------------------------
*/
diff --git a/src/makefiles/Makefile.irix5 b/src/makefiles/Makefile.irix
index 4062161d9ef..4062161d9ef 100644
--- a/src/makefiles/Makefile.irix5
+++ b/src/makefiles/Makefile.irix
diff --git a/src/template/irix5 b/src/template/irix
index e69de29bb2d..e69de29bb2d 100644
--- a/src/template/irix5
+++ b/src/template/irix