git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/GNUmakefile.in b/GNUmakefile.in

index 16f9057efe103fd65dbaa6247f0a784c9fba634d..f7bcc6729caa5695359e8d74ae241d3cdb4a6930 100644 (file)

--- a/GNUmakefile.in

+++ b/GNUmakefile.in

#

# PostgreSQL top level makefile

#

-# $PostgreSQL: pgsql/GNUmakefile.in,v 1.45 2006年08月18日 19:58:05 adunstan Exp $

+# $PostgreSQL: pgsql/GNUmakefile.in,v 1.46 2007年02月09日 15:55:57 petere Exp $

#

subdir =

##########################################################################

-distdir := postgresql-$(VERSION)

-dummy := =install=

-garbage := =* "#"* ."#"* *~* *.orig *.rej core postgresql-*

+distdir = postgresql-$(VERSION)

+dummy = =install=

+garbage = =* "#"* ."#"* *~* *.orig *.rej core postgresql-*

dist: $(distdir).tar.gz

ifeq ($(split-dist), yes)

$(distdir).tar: distdir

$(TAR) chf $@ $(distdir)

-opt_files := \

+opt_files = \

src/tools src/tutorial \

$(addprefix src/pl/, plperl plpython tcl)

-docs_files := doc/postgres.tar.gz doc/src doc/TODO.detail

+docs_files = doc/postgres.tar.gz doc/src doc/TODO.detail

postgresql-base-$(VERSION).tar: distdir

$(TAR) -c $(addprefix --exclude $(distdir)/, $(docs_files) $(opt_files) src/test) \

diff --git a/contrib/tsearch2/Makefile b/contrib/tsearch2/Makefile

index 3694974f8e6c92f2f76f5952e170f4f14387010a..ee8b2dc4f14ab240abb2a8d463fe68252744768b 100644 (file)

--- a/contrib/tsearch2/Makefile

+++ b/contrib/tsearch2/Makefile

-# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.17 2006年09月11日 15:14:46 tgl Exp $

+# $PostgreSQL: pgsql/contrib/tsearch2/Makefile,v 1.18 2007年02月09日 15:55:57 petere Exp $

MODULE_big = tsearch2

OBJS = dict_ex.o dict.o snmap.o stopword.o common.o prs_dcfg.o \

query_util.o query_support.o query_rewrite.o query_gist.o \

ts_locale.o ts_lexize.o ginidx.o

-SUBDIRS := snowball ispell wordparser

-SUBDIROBJS := $(SUBDIRS:%=%/SUBSYS.o)

+SUBDIRS = snowball ispell wordparser

+SUBDIROBJS = $(SUBDIRS:%=%/SUBSYS.o)

OBJS += $(SUBDIROBJS)

diff --git a/doc/Makefile b/doc/Makefile

index 5d47b22a348c12dddaabc90fd23eb46046bb4c6f..484dcdc7874d175752a2fa94fcf1aef1630df49f 100644 (file)

--- a/doc/Makefile

+++ b/doc/Makefile

#

# Copyright (c) 1994, Regents of the University of California

#

-# $PostgreSQL: pgsql/doc/Makefile,v 1.28 2005年12月09日 21:19:34 petere Exp $

+# $PostgreSQL: pgsql/doc/Makefile,v 1.29 2007年02月09日 15:55:57 petere Exp $

#

#----------------------------------------------------------------------------

ifneq ($(wildcard $(srcdir)/postgres.tar.gz),)

ifneq (,$(docdir))

-found_html := yes

+found_html = yes

endif

endif

ifneq ($(wildcard $(srcdir)/man.tar.gz),)

# SCO OpenServer's man system is sufficiently different to not bother.

ifneq ($(PORTNAME), sco)

-found_man := yes

+found_man = yes

endif

endif

diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile

index 7844b5ac8a2b8f0ad7d683449b81ec5d84f8bd4b..2e6bda7cdb2c8869607625e7361368d966cbd711 100644 (file)

--- a/doc/src/sgml/Makefile

+++ b/doc/src/sgml/Makefile

#

# PostgreSQL documentation makefile

#

-# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.94 2007年01月27日 22:44:32 momjian Exp $

+# $PostgreSQL: pgsql/doc/src/sgml/Makefile,v 1.95 2007年02月09日 15:55:57 petere Exp $

#

#----------------------------------------------------------------------------

.PHONY: html man draft clean

-DEFAULTSECTION := $(sqlmansect_dummy)

+DEFAULTSECTION = $(sqlmansect_dummy)

fix_man_xrefs = $(PERL) -npi -e 's{\[XRef to GUC-([A-Z0-9-]*)\]}{($$l = $1ドル) =~ tr/A-Z-/a-z_/, $$l}ge || s{\[XRef to [A-Z0-9-]*\]}{in the documentation}g'

@$(MAKE) DRAFT="Y" html

-COLLATEINDEX := LC_ALL=C $(PERL) $(COLLATEINDEX) -f -g

+COLLATEINDEX = LC_ALL=C $(PERL) $(COLLATEINDEX) -f -g

# bookindex.sgml is required so there is a proper index for all output formats

bookindex.sgml: HTML.index

diff --git a/src/Makefile.global.in b/src/Makefile.global.in

index 820dfd596533246d308b1b1d368b9a88431baa58..740918e422ec612194985d2095e8805411bef7b3 100644 (file)

--- a/src/Makefile.global.in

+++ b/src/Makefile.global.in

# -*-makefile-*-

-# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.232 2006年10月08日 17:15:33 tgl Exp $

+# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.233 2007年02月09日 15:55:57 petere Exp $

#------------------------------------------------------------------------------

# All PostgreSQL makefiles include this file and use the variables it sets,

# This macro is for use by libraries linking to libpq. (Because libpgport

# isn't created with the same link flags as libpq, it can't be used.)

-libpq := -L$(libpq_builddir) -lpq

+libpq = -L$(libpq_builddir) -lpq

# If doing static linking, shared library dependency info isn't available,

# so add in the libraries that libpq depends on.

diff --git a/src/Makefile.shlib b/src/Makefile.shlib

index c8736298f010ae37c35bfe018457848236a66051..2cb84c940d0133dab3491b0def5c963a4c5677d0 100644 (file)

--- a/src/Makefile.shlib

+++ b/src/Makefile.shlib

# Copyright (c) 1998, Regents of the University of California

#

# IDENTIFICATION

-# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.106 2007年01月07日 08:49:31 petere Exp $

+# $PostgreSQL: pgsql/src/Makefile.shlib,v 1.107 2007年02月09日 15:55:57 petere Exp $

#

#-------------------------------------------------------------------------

SHLIB_LINK := $(filter -L%, $(SHLIB_LINK)) $(filter -L%, $(LDFLAGS)) $(filter-out -L%, $(SHLIB_LINK))

# Need a -L-free version of LDFLAGS to use in combination with SHLIB_LINK

-LDFLAGS_NO_L := $(filter-out -L%, $(LDFLAGS))

+LDFLAGS_NO_L = $(filter-out -L%, $(LDFLAGS))

# Default shlib naming convention used by the majority of platforms

shlib = lib$(NAME)$(DLSUFFIX).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)

ifeq ($(PORTNAME), darwin)

ifneq ($(SO_MAJOR_VERSION), 0)

- version_link := -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)

+ version_link = -compatibility_version $(SO_MAJOR_VERSION) -current_version $(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)

endif

ifeq ($(DLTYPE), library)

# linkable library

- DLSUFFIX := .dylib

+ DLSUFFIX = .dylib

LINK.shared = $(COMPILER) -dynamiclib -install_name $(libdir)/lib$(NAME).$(SO_MAJOR_VERSION)$(DLSUFFIX) $(version_link) $(exported_symbols_list) -multiply_defined suppress

else

# loadable module (default case)

- DLSUFFIX := .so

+ DLSUFFIX = .so

LINK.shared = $(COMPILER) -bundle -multiply_defined suppress

endif

shlib = lib$(NAME).$(SO_MAJOR_VERSION).$(SO_MINOR_VERSION)$(DLSUFFIX)

# ld can find the same libraries gcc does. Make sure it goes after any

# -L switches provided explicitly.

ifeq ($(GCC), yes)

- SHLIB_LINK := $(filter -L%, $(SHLIB_LINK)) -L/usr/local/lib $(filter-out -L%, $(SHLIB_LINK))

+ SHLIB_LINK = $(filter -L%, $(SHLIB_LINK)) -L/usr/local/lib $(filter-out -L%, $(SHLIB_LINK))

endif

endif

# do this last so above filtering doesn't pull out -L switches in LDFLAGS

diff --git a/src/backend/Makefile b/src/backend/Makefile

index cfbd4b3d22d0d11fe7c43fc89ab8f8d80ea45058..2082bf294eb173e1b1a87cb2d221a92c2675f86e 100644 (file)

--- a/src/backend/Makefile

+++ b/src/backend/Makefile

#

# Copyright (c) 1994, Regents of the University of California

#

-# $PostgreSQL: pgsql/src/backend/Makefile,v 1.121 2007年01月20日 17:16:10 petere Exp $

+# $PostgreSQL: pgsql/src/backend/Makefile,v 1.122 2007年02月09日 15:55:57 petere Exp $

#

#-------------------------------------------------------------------------

top_builddir = ../..

include $(top_builddir)/src/Makefile.global

-DIRS := access bootstrap catalog parser commands executor lib libpq \

+DIRS = access bootstrap catalog parser commands executor lib libpq \

main nodes optimizer port postmaster regex rewrite \

storage tcop utils $(top_builddir)/src/timezone

-SUBSYSOBJS := $(DIRS:%=%/SUBSYS.o)

+SUBSYSOBJS = $(DIRS:%=%/SUBSYS.o)

ifeq ($(enable_dtrace), yes)

LOCALOBJS += utils/probes.o

diff --git a/src/backend/access/Makefile b/src/backend/access/Makefile

index 1f120c641057dee2a18e3e7dfa366426112b3c54..bf42037a9ff3dd6f2d39c0ee02159792aec96e2a 100644 (file)

--- a/src/backend/access/Makefile

+++ b/src/backend/access/Makefile

#

# Makefile for the access methods module

#

-# $PostgreSQL: pgsql/src/backend/access/Makefile,v 1.12 2007年01月20日 17:16:10 petere Exp $

+# $PostgreSQL: pgsql/src/backend/access/Makefile,v 1.13 2007年02月09日 15:55:58 petere Exp $

#

subdir = src/backend/access

top_builddir = ../../..

include $(top_builddir)/src/Makefile.global

-SUBDIRS := common gist hash heap index nbtree transam gin

-SUBDIROBJS := $(SUBDIRS:%=%/SUBSYS.o)

+SUBDIRS = common gist hash heap index nbtree transam gin

+SUBDIROBJS = $(SUBDIRS:%=%/SUBSYS.o)

all: SUBSYS.o

diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile

index 0482467bbbe5bd3233b8b6b4d7d87f8034ac8865..026d9053a0aa639444cb74940ed36ee8538f9c5d 100644 (file)

--- a/src/backend/catalog/Makefile

+++ b/src/backend/catalog/Makefile

#

# Makefile for backend/catalog

#

-# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.62 2007年02月06日 09:16:08 petere Exp $

+# $PostgreSQL: pgsql/src/backend/catalog/Makefile,v 1.63 2007年02月09日 15:55:58 petere Exp $

#

#-------------------------------------------------------------------------

# the catalog header files are assembled into postgres.bki. In particular,

# indexing.h had better be last, and toasting.h just before it.

-POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\

+POSTGRES_BKI_SRCS = $(addprefix $(top_srcdir)/src/include/catalog/,\

pg_proc.h pg_type.h pg_attribute.h pg_class.h pg_autovacuum.h \

pg_attrdef.h pg_constraint.h pg_inherits.h pg_index.h pg_operator.h \

pg_opfamily.h pg_opclass.h pg_am.h pg_amop.h pg_amproc.h \

toasting.h indexing.h \

)

-pg_includes := $(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include)

+pg_includes = $(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include)

# see explanation in ../parser/Makefile

postgres.description: postgres.bki ;

diff --git a/src/backend/optimizer/Makefile b/src/backend/optimizer/Makefile

index e3f3a405d61cae235601ea19a6adcb4fe6de6007..ef63ef11614c49e26d143247b1a9fa2ffcdd5c73 100644 (file)

--- a/src/backend/optimizer/Makefile

+++ b/src/backend/optimizer/Makefile

#

# Makefile for optimizer

#

-# $PostgreSQL: pgsql/src/backend/optimizer/Makefile,v 1.12 2007年01月20日 17:16:11 petere Exp $

+# $PostgreSQL: pgsql/src/backend/optimizer/Makefile,v 1.13 2007年02月09日 15:55:58 petere Exp $

#

subdir = src/backend/optimizer

top_builddir = ../../..

include $(top_builddir)/src/Makefile.global

-SUBDIRS := geqo path plan prep util

-SUBDIROBJS := $(SUBDIRS:%=%/SUBSYS.o)

+SUBDIRS = geqo path plan prep util

+SUBDIROBJS = $(SUBDIRS:%=%/SUBSYS.o)

all: SUBSYS.o

diff --git a/src/backend/storage/Makefile b/src/backend/storage/Makefile

index a9301cacaf81c76b3717b57de69986c05086b264..06d90b2a3cc9f3971532dd13bb224711d5a09476 100644 (file)

--- a/src/backend/storage/Makefile

+++ b/src/backend/storage/Makefile

#

# Makefile for the storage manager subsystem

#

-# $PostgreSQL: pgsql/src/backend/storage/Makefile,v 1.12 2007年01月20日 17:16:12 petere Exp $

+# $PostgreSQL: pgsql/src/backend/storage/Makefile,v 1.13 2007年02月09日 15:55:58 petere Exp $

#

subdir = src/backend/storage

top_builddir = ../../..

include $(top_builddir)/src/Makefile.global

-SUBDIRS := buffer file freespace ipc large_object lmgr page smgr

-SUBDIROBJS := $(SUBDIRS:%=%/SUBSYS.o)

+SUBDIRS = buffer file freespace ipc large_object lmgr page smgr

+SUBDIROBJS = $(SUBDIRS:%=%/SUBSYS.o)

all: SUBSYS.o

diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile

index 5c3c20b815d36ee87a62645f3b7411a2d7c68940..cd886d17fb7d61024d1dc5d757b31969e03e073c 100644 (file)

--- a/src/backend/utils/Makefile

+++ b/src/backend/utils/Makefile

#

# Makefile for utils

#

-# $PostgreSQL: pgsql/src/backend/utils/Makefile,v 1.24 2006年07月15日 03:33:14 tgl Exp $

+# $PostgreSQL: pgsql/src/backend/utils/Makefile,v 1.25 2007年02月09日 15:55:58 petere Exp $

#

subdir = src/backend/utils

top_builddir = ../../..

include $(top_builddir)/src/Makefile.global

-SUBDIRS := adt cache error fmgr hash init mb misc mmgr resowner sort time

-SUBDIROBJS := $(SUBDIRS:%=%/SUBSYS.o)

+SUBDIRS = adt cache error fmgr hash init mb misc mmgr resowner sort time

+SUBDIROBJS = $(SUBDIRS:%=%/SUBSYS.o)

all: SUBSYS.o fmgroids.h

diff --git a/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile

index 39beee6654ec4bd6c608ecbf6690c2a2aecf02fb..1ce163e93216549aba6666424d620c98049cc164 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile

+++ b/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile,v 1.4 2003年11月29日 22:40:02 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile,v 1.5 2007年02月09日 15:55:58 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/ascii_and_mic

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := ascii_and_mic

+NAME = ascii_and_mic

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile

index 3a7712687b7d86b84114ff55fef0daf441f8e10a..dc270b414716461f8dc33d6651b68287c6894a95 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile

+++ b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile,v 1.3 2003年11月29日 22:40:04 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile,v 1.4 2007年02月09日 15:55:58 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/cyrillic_and_mic

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := cyrillic_and_mic

+NAME = cyrillic_and_mic

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile

index b10f000559a3e39d1bdbc8ad6e5723e3de170075..4bc4c55de4d25fc1db6f433992b1550c39f55935 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile

+++ b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile,v 1.3 2003年11月29日 22:40:05 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile,v 1.4 2007年02月09日 15:55:58 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/euc_cn_and_mic

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := euc_cn_and_mic

+NAME = euc_cn_and_mic

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile

index 100f46bf243d3da82a532bf46859097049368eb7..54e5b185121c541a605ce4771785b34a8764c0e6 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile

+++ b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile,v 1.3 2003年11月29日 22:40:06 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile,v 1.4 2007年02月09日 15:55:58 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/euc_jp_and_sjis

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := euc_jp_and_sjis

+NAME = euc_jp_and_sjis

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile

index 5dd697128bdbd98f897f458ce024a60537f74d2c..37be61fa9ad098079e3aad9215f49f9809a1b672 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile

+++ b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile,v 1.3 2003年11月29日 22:40:07 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile,v 1.4 2007年02月09日 15:55:58 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/euc_kr_and_mic

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := euc_kr_and_mic

+NAME = euc_kr_and_mic

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile

index ccf1d66106cfac5996f4c2422713a4cbfbacee29..0efa61fdc208c5f663c8b5b2dd3b0778f534ce1c 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile

+++ b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile,v 1.3 2003年11月29日 22:40:08 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile,v 1.4 2007年02月09日 15:55:58 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/euc_tw_and_big5

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := euc_tw_and_big5

+NAME = euc_tw_and_big5

SRCS += big5.c

OBJS += big5.o

diff --git a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile

index 83abeaa4e94b8ecfc591a6e7cc9a38c08f22c576..c7c2b7c0e259028cd8d6007ab249e1bb33cf8a56 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile

+++ b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile,v 1.3 2003年11月29日 22:40:09 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile,v 1.4 2007年02月09日 15:55:58 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/latin2_and_win1250

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := latin2_and_win1250

+NAME = latin2_and_win1250

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile b/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile

index 2528f7f0dbc8fa157e34d22baffef53f77d4a0ec..99da5d748111e866708f382350094e3363ac0077 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile

+++ b/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile,v 1.3 2003年11月29日 22:40:10 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile,v 1.4 2007年02月09日 15:55:58 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/latin_and_mic

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := latin_and_mic

+NAME = latin_and_mic

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile

index 0bf6263d1a9e38978b3365560de00a8fe11f9ba4..a706b42661cb16ca0809a34d71329d74aa282977 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile,v 1.3 2003年11月29日 22:40:14 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile,v 1.4 2007年02月09日 15:55:58 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_ascii

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_ascii

+NAME = utf8_and_ascii

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile

index e5cb9e16a3b2bface6deb69567646aed0403a7dd..772ebe1977de48d69ac62d2a8d88efdbf4ddc2df 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile,v 1.3 2003年11月29日 22:40:15 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile,v 1.4 2007年02月09日 15:55:58 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_big5

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_big5

+NAME = utf8_and_big5

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile

index bfd4e80cc76ddde239d045bc79d8b5196b9cbe7e..0ff9aaf8c950baf13162b21bce58cd18280f75b5 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile,v 1.3 2003年11月29日 22:40:16 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile,v 1.4 2007年02月09日 15:55:58 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_cyrillic

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_cyrillic

+NAME = utf8_and_cyrillic

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile

index e81d8d3f5e48efe2fafb9ade49a2e15e28fedd55..a14326e82016bbfa62a0ac4f388953540642b7a4 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile,v 1.3 2003年11月29日 22:40:17 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile,v 1.4 2007年02月09日 15:55:58 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_cn

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_euc_cn

+NAME = utf8_and_euc_cn

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile

index 4a62a9fde6d526b918ba69e3d11a67ec9cb4b82e..8933b8af15535e59a811d9e088853ce234a14b9a 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile,v 1.3 2003年11月29日 22:40:19 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile,v 1.4 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_jp

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_euc_jp

+NAME = utf8_and_euc_jp

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile

index 3d45bedf571f2a9225e5bf2d7990e3185fbee60f..1ebebc701f09e38c405a6df126485b5949cfbf26 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile,v 1.3 2003年11月29日 22:40:20 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile,v 1.4 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_kr

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_euc_kr

+NAME = utf8_and_euc_kr

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile

index a20cda0d502c2beceebdaa3187cd9ae80615807d..d9bf16a24defa9a20d620002a2c123c7da9571bb 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile,v 1.3 2003年11月29日 22:40:21 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile,v 1.4 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_euc_tw

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_euc_tw

+NAME = utf8_and_euc_tw

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile

index 208054785714f624805bf1873375d70ab7a8998c..7fd1a32876f6fc2bd9f1b70de5adcdb923b775b6 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile,v 1.3 2003年11月29日 22:40:23 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile,v 1.4 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_gb18030

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_gb18030

+NAME = utf8_and_gb18030

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile

index 8788507477a866c073e6aea3811eebebcef1b684..5338e7928e2d72fdce8f95677b69ed133e569dff 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile,v 1.3 2003年11月29日 22:40:24 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile,v 1.4 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_gbk

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_gbk

+NAME = utf8_and_gbk

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile

index b04d8f95d7d5cfe8f93edfde469affd0f38a921d..bbdb83996f820fa6f91c4d5ba3e16d7b2312732d 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile,v 1.3 2003年11月29日 22:40:32 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile,v 1.4 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_iso8859

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_iso8859

+NAME = utf8_and_iso8859

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile

index bf14250f820603295934e661a6191874eff20a9e..7db2f359d71fd6548e589314785a8a2f104238f8 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile,v 1.3 2003年11月29日 22:40:33 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile,v 1.4 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_iso8859_1

+NAME = utf8_and_iso8859_1

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile

index 48ef8088247b175d3def768075e79e4cc53d057b..b3e479774ad936a181680db42bd2867c71d2ca1e 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile,v 1.3 2003年11月29日 22:40:35 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile,v 1.4 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_johab

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_johab

+NAME = utf8_and_johab

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile

index b0091a7d1e83652344dd22eadcd9e45645603c12..2927989bd6916c24d75237c9855ba2e6115173fe 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile,v 1.3 2003年11月29日 22:40:37 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile,v 1.4 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_sjis

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_sjis

+NAME = utf8_and_sjis

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile

index d1872f160510d7354cd63d227d228a0051c47db8..fb2ba930bfc84ba1b23f5a6aaa8a189946ed4704 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile,v 1.3 2003年11月29日 22:40:39 pgsql Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile,v 1.4 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_uhc

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_uhc

+NAME = utf8_and_uhc

include $(srcdir)/../proc.mk

diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile b/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile

index c7c6f18cdd1e2d97b9243ef9f3c7d469f9122869..8dd98059461497efdaf5fcdff7b0dbbcb884e727 100644 (file)

--- a/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile

+++ b/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile

#-------------------------------------------------------------------------

#

-# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile,v 1.1 2006年02月18日 16:15:22 petere Exp $

+# $PostgreSQL: pgsql/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile,v 1.2 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

subdir = src/backend/utils/mb/conversion_procs/utf8_and_win

top_builddir = ../../../../../..

include $(top_builddir)/src/Makefile.global

-NAME := utf8_and_win

+NAME = utf8_and_win

include $(srcdir)/../proc.mk

diff --git a/src/bin/Makefile b/src/bin/Makefile

index 16a39eea1a00329e58a64a09c377fab493108ac9..1f319d5596d575c13e29d44b478c4189fbcdac63 100644 (file)

--- a/src/bin/Makefile

+++ b/src/bin/Makefile

# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group

# Portions Copyright (c) 1994, Regents of the University of California

#

-# $PostgreSQL: pgsql/src/bin/Makefile,v 1.49 2007年01月20日 17:16:15 petere Exp $

+# $PostgreSQL: pgsql/src/bin/Makefile,v 1.50 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

top_builddir = ../..

include $(top_builddir)/src/Makefile.global

-DIRS := initdb ipcclean pg_ctl pg_dump \

+DIRS = initdb ipcclean pg_ctl pg_dump \

psql scripts pg_config pg_controldata pg_resetxlog

ifeq ($(PORTNAME), win32)

DIRS+=pgevent

diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile

index 4e68bf776b8ed5f3732f0cf81f27fc2cb4e0e2fd..db0e4ff671692d9ab8dcd3b84f2578d34021df5f 100644 (file)

--- a/src/interfaces/Makefile

+++ b/src/interfaces/Makefile

#

# Copyright (c) 1994, Regents of the University of California

#

-# $PostgreSQL: pgsql/src/interfaces/Makefile,v 1.54 2007年01月20日 17:16:15 petere Exp $

+# $PostgreSQL: pgsql/src/interfaces/Makefile,v 1.55 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

top_builddir = ../..

include $(top_builddir)/src/Makefile.global

-DIRS := libpq ecpg

+DIRS = libpq ecpg

-ALLDIRS := $(DIRS)

+ALLDIRS = $(DIRS)

all install installdirs uninstall distprep:

@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done

diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile

index 204b123aec60a0e7514a45a4cc7090d2c96b1616..e5934c6fb3229bc1b49bd243a940ac35187c6918 100644 (file)

--- a/src/interfaces/ecpg/test/Makefile

+++ b/src/interfaces/ecpg/test/Makefile

-# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.65 2007年01月21日 09:23:29 petere Exp $

+# $PostgreSQL: pgsql/src/interfaces/ecpg/test/Makefile,v 1.66 2007年02月09日 15:55:59 petere Exp $

subdir = src/interfaces/ecpg/test

top_builddir = ../../../..

MULTIBYTE = SQL_ASCII

# locale

-NOLOCALE :=

+NOLOCALE =

ifdef NO_LOCALE

NOLOCALE += --no-locale

endif

diff --git a/src/pl/Makefile b/src/pl/Makefile

index 573b4945577bfb09da1259d9730132a464d8f066..1b4ef86a59fe9c3d44725f5bbae1db1514539bef 100644 (file)

--- a/src/pl/Makefile

+++ b/src/pl/Makefile

#

# Copyright (c) 1994, Regents of the University of California

#

-# $PostgreSQL: pgsql/src/pl/Makefile,v 1.24 2007年01月20日 17:16:17 petere Exp $

+# $PostgreSQL: pgsql/src/pl/Makefile,v 1.25 2007年02月09日 15:55:59 petere Exp $

#

#-------------------------------------------------------------------------

top_builddir = ../..

include $(top_builddir)/src/Makefile.global

-DIRS := plpgsql

+DIRS = plpgsql

ifeq ($(with_perl), yes)

DIRS += plperl

diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile

index 11583763ff95b5482bda22edaacbb36ba2954254..b91e81949095a275170875ef8671812d336e1dcd 100644 (file)

--- a/src/pl/plperl/GNUmakefile

+++ b/src/pl/plperl/GNUmakefile

# Makefile for PL/Perl

-# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.28 2006年07月21日 00:24:04 tgl Exp $

+# $PostgreSQL: pgsql/src/pl/plperl/GNUmakefile,v 1.29 2007年02月09日 15:56:00 petere Exp $

subdir = src/pl/plperl

top_builddir = ../../..

ifneq (,$(findstring yes, $(shared_libperl)$(allow_nonpic_in_shlib)))

ifeq ($(PORTNAME), win32)

-perl_archlibexp := $(subst ,円/,$(perl_archlibexp))

-perl_privlibexp := $(subst ,円/,$(perl_privlibexp))

-perl_embed_ldflags := -L$(perl_archlibexp)/CORE -lperl58

+perl_archlibexp = $(subst ,円/,$(perl_archlibexp))

+perl_privlibexp = $(subst ,円/,$(perl_privlibexp))

+perl_embed_ldflags = -L$(perl_archlibexp)/CORE -lperl58

override CPPFLAGS += -DPLPERL_HAVE_UID_GID

endif

diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile

index b0a9649be533cf809e8bfdfcc3756137bd039158..38092ee432f1602fd0070277c817d5559fb35e69 100644 (file)

--- a/src/pl/plpgsql/src/Makefile

+++ b/src/pl/plpgsql/src/Makefile

#

# Makefile for the plpgsql shared object

#

-# $PostgreSQL: pgsql/src/pl/plpgsql/src/Makefile,v 1.29 2006年03月07日 01:03:12 tgl Exp $

+# $PostgreSQL: pgsql/src/pl/plpgsql/src/Makefile,v 1.30 2007年02月09日 15:56:00 petere Exp $

#

#-------------------------------------------------------------------------

override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)

SHLIB_LINK = $(filter -lintl, $(LIBS)) $(BE_DLLLIBS)

-rpath :=

+rpath =

OBJS = pl_gram.o pl_handler.o pl_comp.o pl_exec.o pl_funcs.o

diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile

index 9d02f4d7f41007ba169c21a902b17ad68d4c2afd..b9a0821c0aa3733af76769a27481022ac88ba8e1 100644 (file)

--- a/src/pl/plpython/Makefile

+++ b/src/pl/plpython/Makefile

-# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.26 2006年07月21日 00:24:04 tgl Exp $

+# $PostgreSQL: pgsql/src/pl/plpython/Makefile,v 1.27 2007年02月09日 15:56:00 petere Exp $

subdir = src/pl/plpython

top_builddir = ../../..

# and we have to remove -lpython from the link since we are building our own

ifeq ($(PORTNAME), win32)

shared_libpython = yes

-python_includespec := $(subst ,円/,$(python_includespec))

-override python_libspec :=

+python_includespec = $(subst ,円/,$(python_includespec))

+override python_libspec =

endif

# Darwin (OS X) has its own ideas about how to do this.

ifeq ($(PORTNAME), darwin)

shared_libpython = yes

-override python_libspec := -framework Python

-override python_additional_libs :=

+override python_libspec = -framework Python

+override python_additional_libs =

endif

# If we don't have a shared library and the platform doesn't allow it

diff --git a/src/port/Makefile b/src/port/Makefile

index 1742eb859864ea8fb05def82061cae94256a85de..5ab4dd0a780f44cdfebd41e676a6bbe7c9d0bfca 100644 (file)

--- a/src/port/Makefile

+++ b/src/port/Makefile

# for use only by the backend binaries

#

# IDENTIFICATION

-# $PostgreSQL: pgsql/src/port/Makefile,v 1.33 2006年07月14日 16:45:43 tgl Exp $

+# $PostgreSQL: pgsql/src/port/Makefile,v 1.34 2007年02月09日 15:56:00 petere Exp $

#

#-------------------------------------------------------------------------

LIBS += $(PTHREAD_LIBS)

# Replace all object files so they use FRONTEND define

-LIBOBJS_SRV := $(LIBOBJS:%.o=%_srv.o)

+LIBOBJS_SRV = $(LIBOBJS:%.o=%_srv.o)

all: libpgport.a libpgport_srv.a

diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile

index 277d65ccc6bc6cf414d08fb6afe5ba236bf6e335..94c4bbf95822437151281b6b15e0774c49a85a99 100644 (file)

--- a/src/test/regress/GNUmakefile

+++ b/src/test/regress/GNUmakefile

# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group

# Portions Copyright (c) 1994, Regents of the University of California

#

-# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.65 2007年01月31日 19:38:50 neilc Exp $

+# $PostgreSQL: pgsql/src/test/regress/GNUmakefile,v 1.66 2007年02月09日 15:56:00 petere Exp $

#

#-------------------------------------------------------------------------

top_builddir = ../../..

include $(top_builddir)/src/Makefile.global

-contribdir := $(top_builddir)/contrib

+contribdir = $(top_builddir)/contrib

# port number for temp-installation test postmaster

TEMP_PORT = 5$(DEF_PGPORT)

MULTIBYTE = SQL_ASCII

# maximum simultaneous connections for parallel tests

-MAXCONNOPT :=

+MAXCONNOPT =

ifdef MAX_CONNECTIONS

MAXCONNOPT += --max-connections=$(MAX_CONNECTIONS)

endif

# locale

-NOLOCALE :=

+NOLOCALE =

ifdef NO_LOCALE

NOLOCALE += --no-locale

endif

diff --git a/src/timezone/Makefile b/src/timezone/Makefile

index 69e79b8536ea144c515bd895b3b2494f3909f616..3af8c376f895a3c97e8432deaa9a353de222e73f 100644 (file)

--- a/src/timezone/Makefile

+++ b/src/timezone/Makefile

# Makefile for the timezone library

# IDENTIFICATION

-# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.24 2006年07月25日 03:51:22 tgl Exp $

+# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.25 2007年02月09日 15:56:00 petere Exp $

#

#-------------------------------------------------------------------------

top_builddir = ../..

include $(top_builddir)/src/Makefile.global

-override CPPFLAGS := $(CPPFLAGS)

-

# files to build into backend

OBJS= localtime.o strftime.o pgtz.o

ZICOBJS= zic.o ialloc.o scheck.o localtime.o

# timezone data files

-TZDATA := africa antarctica asia australasia europe northamerica southamerica \

+TZDATA = africa antarctica asia australasia europe northamerica southamerica \

pacificnew etcetera factory backward systemv solar87 solar88 solar89

-TZDATAFILES := $(TZDATA:%=$(srcdir)/data/%)

+TZDATAFILES = $(TZDATA:%=$(srcdir)/data/%)

all: SUBSYS.o submake-libpgport zic

diff --git a/src/timezone/tznames/Makefile b/src/timezone/tznames/Makefile

index aca2c5959639ce1d00e11118d1eee847b5b0be17..8f1c6447b6469ab0edb8a309a05eab9aa6a4daf9 100644 (file)

--- a/src/timezone/tznames/Makefile

+++ b/src/timezone/tznames/Makefile

# Makefile for the timezone names

# IDENTIFICATION

-# $PostgreSQL: pgsql/src/timezone/tznames/Makefile,v 1.1 2006年07月25日 03:51:23 tgl Exp $

+# $PostgreSQL: pgsql/src/timezone/tznames/Makefile,v 1.2 2007年02月09日 15:56:00 petere Exp $

#

#-------------------------------------------------------------------------

top_builddir = ../../..

include $(top_builddir)/src/Makefile.global

-TZNAMES_TEMPLATES := Africa.txt America.txt Antarctica.txt Asia.txt \

+TZNAMES_TEMPLATES = Africa.txt America.txt Antarctica.txt Asia.txt \

Atlantic.txt Australia.txt Etc.txt Europe.txt Indian.txt Pacific.txt

-TZNAMES_TEMPLATES_FILES := $(TZNAMES_TEMPLATES:%=$(srcdir)/%)

+TZNAMES_TEMPLATES_FILES = $(TZNAMES_TEMPLATES:%=$(srcdir)/%)

-TZNAMES_SETS := Default Australia India

-TZNAMES_SETS_FILES := $(TZNAMES_SETS:%=$(srcdir)/%)

+TZNAMES_SETS = Default Australia India

+TZNAMES_SETS_FILES = $(TZNAMES_SETS:%=$(srcdir)/%)

install: installdirs

$(INSTALL_DATA) $(TZNAMES_TEMPLATES_FILES) '$(DESTDIR)$(datadir)/timezonesets'