aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2000-11-09 18:18:42 +0000
committerPeter Eisentraut <peter_e@gmx.net>2000-11-09 18:18:42 +0000
commit6b70f3862cc0328677aa9b7adbb3e095ba7227b0 (patch)
tree43bb3067252e0de1064c81c3af410cb85c97f1e0 /src
parent343f615e3ada8a7e9662b33341b73f09e182d105 (diff)
downloadpostgresql-6b70f3862cc0328677aa9b7adbb3e095ba7227b0.tar.gz
postgresql-6b70f3862cc0328677aa9b7adbb3e095ba7227b0.zip
Also test for 'void *' as third arg of accept() (as on Solaris 7 and 8),
but take it as 'int *' instead. Add real test for whether ld -R works on Unixware. Rename --enable-uniconv to --enable-unicode-conversion. Install shlibs mode 755 by default, since 644 causes gratuitous complaints from ldd et al. on some systems.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.global.in3
-rw-r--r--src/makefiles/Makefile.unixware2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index ef2556784e8..eaa3bf30420 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.110 2000/11/05 21:04:07 petere Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.111 2000/11/09 18:18:42 petere Exp $
#------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -165,6 +165,7 @@ FLEXFLAGS = @FLEXFLAGS@ $(LFLAGS)
LIBS = @LIBS@
LD = @LD@
with_gnu_ld = @with_gnu_ld@
+ld_R_works = @ld_R_works@
LDFLAGS = @LDFLAGS@ $(LIBS)
LDREL = -r
LDOUT = -o
diff --git a/src/makefiles/Makefile.unixware b/src/makefiles/Makefile.unixware
index 6a8d3829489..698ea98118e 100644
--- a/src/makefiles/Makefile.unixware
+++ b/src/makefiles/Makefile.unixware
@@ -1,6 +1,6 @@
AROPT = crs
export_dynamic = -Wl,-Bexport
-ifneq (,$(findstring uw7.1, $(host_os)))
+ifeq ($(ld_R_works), yes)
rpath = -Wl,-R$(libdir)
endif
DLSUFFIX = .so