Address build problems on cygwin and (hopefully) AIX.

diff --git a/src/backend/Makefile b/src/backend/Makefile
index dcfa3cad39b2ccee2bc315d67b9b1a2d11c018aa..69900e449c4ed804e90ee958acc77fd22af49019 100644 (file)
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -4,7 +4,7 @@
 #
 # Copyright (c) 1994, Regents of the University of California
 #
-# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.82 2002/07/27 20:10:04 petere Exp $
+# $Header: /cvsroot/pgsql/src/backend/Makefile,v 1.83 2002/08/08 07:47:42 ishii Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -30,6 +30,7 @@ endif
 ##########################################################################
 
 all: submake-libpgport postgres $(POSTGRES_IMP)
+   $(MAKE) -C utils/mb/conversion_procs $@
 ifeq ($(enable_nls), yes)
    $(MAKE) -C po all
 endif
@@ -130,6 +131,7 @@ ifeq ($(enable_nls), yes)
    $(MAKE) -C po $@
 endif
    $(MAKE) -C utils/mb $@
+   $(MAKE) -C utils/mb/conversion_procs $@
 
 install-bin: postgres $(POSTGRES_IMP) installdirs
    $(INSTALL_PROGRAM) postgres$(X) $(DESTDIR)$(bindir)/postgres$(X)

diff --git a/src/backend/utils/mb/Makefile b/src/backend/utils/mb/Makefile
index ea460aa529787f03bd349b090a4c3a09d983ae38..76b448687697a07242a444ce3c58870b80502dea 100644 (file)
--- a/src/backend/utils/mb/Makefile
+++ b/src/backend/utils/mb/Makefile
@@ -4,7 +4,7 @@
 #    Makefile for utils/mb
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.19 2002/08/06 05:40:45 ishii Exp $
+#    $Header: /cvsroot/pgsql/src/backend/utils/mb/Makefile,v 1.20 2002/08/08 07:47:43 ishii Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -16,14 +16,12 @@ OBJS = encnames.o conv.o mbutils.o wchar.o wstrcmp.o wstrncmp.o
 DIRS = conversion_procs
 
 all install installdirs uninstal distprep: SUBSYS.o
-   @for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
 
 clean distclean maintainer-clean:
    rm -f SUBSYS.o $(OBJS)
    @for dir in $(DIRS); do $(MAKE) -C $$dir $@; done
 
 SUBSYS.o: $(OBJS)
-   @for dir in $(DIRS); do $(MAKE) -C $$dir all || exit; done
    $(LD) $(LDREL) $(LDOUT) $@ $^
 
 depend dep:

diff --git a/src/backend/utils/mb/conversion_procs/proc.mk b/src/backend/utils/mb/conversion_procs/proc.mk
index a6582d06127554503b563bf0a27302596f69cf75..59f84455e3f5ae42bc96f8299c4179ff00ef7df9 100644 (file)
--- a/src/backend/utils/mb/conversion_procs/proc.mk
+++ b/src/backend/utils/mb/conversion_procs/proc.mk
@@ -2,7 +2,7 @@ SRCS        += $(NAME).c
 OBJS       += $(NAME).o
 
 PG_CPPFLAGS    :=
-SHLIB_LINK     :=
+SHLIB_LINK     := $(BE_DLLLIBS)
 
 SO_MAJOR_VERSION := 0
 SO_MINOR_VERSION := 0