diff options
| author | Tatsuo Ishii | 2002-08-08 07:47:43 +0000 |
|---|---|---|
| committer | Tatsuo Ishii | 2002-08-08 07:47:43 +0000 |
| commit | 697b4720991494e1d76cfa18ec62972d33e68442 (patch) | |
| tree | 6fe12f7dfe1af35974a458312ba865c1301c4627 | |
| parent | 3c63578a7e703800c73bac15174e5f30f6c72682 (diff) | |
Address build problems on cygwin and (hopefully) AIX.
| -rw-r--r-- | src/backend/Makefile | 4 | ||||
| -rw-r--r-- | src/backend/utils/mb/Makefile | 4 | ||||
| -rw-r--r-- | src/backend/utils/mb/conversion_procs/proc.mk | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index dcfa3cad39b..69900e449c4 100644 --- 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 ea460aa5297..76b44868769 100644 --- 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 a6582d06127..59f84455e3f 100644 --- 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 |