summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPeter Eisentraut2007-02-09 15:56:00 +0000
committerPeter Eisentraut2007-02-09 15:56:00 +0000
commitc138b966d42e69446b52a3e65a596f0401c41a33 (patch)
tree1542dc3cf0db17ec247d9c9309bdbac419c63720 /src
parentd7fee591dbf26e4f0ca52b05cee4b34ea84b7cd6 (diff)
Replace useless uses of := by = in makefiles.
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.global.in4
-rw-r--r--src/Makefile.shlib12
-rw-r--r--src/backend/Makefile6
-rw-r--r--src/backend/access/Makefile6
-rw-r--r--src/backend/catalog/Makefile6
-rw-r--r--src/backend/optimizer/Makefile6
-rw-r--r--src/backend/storage/Makefile6
-rw-r--r--src/backend/utils/Makefile6
-rw-r--r--src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile4
-rw-r--r--src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile4
-rw-r--r--src/bin/Makefile4
-rw-r--r--src/interfaces/Makefile6
-rw-r--r--src/interfaces/ecpg/test/Makefile4
-rw-r--r--src/pl/Makefile4
-rw-r--r--src/pl/plperl/GNUmakefile8
-rw-r--r--src/pl/plpgsql/src/Makefile4
-rw-r--r--src/pl/plpython/Makefile10
-rw-r--r--src/port/Makefile4
-rw-r--r--src/test/regress/GNUmakefile8
-rw-r--r--src/timezone/Makefile8
-rw-r--r--src/timezone/tznames/Makefile10
42 files changed, 106 insertions, 108 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index 820dfd59653..740918e422e 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
# -*-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,
@@ -341,7 +341,7 @@ endif
# 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 c8736298f01..2cb84c940d0 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.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 $
#
#-------------------------------------------------------------------------
@@ -77,7 +77,7 @@ ifeq ($(enable_shared), yes)
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)
@@ -102,15 +102,15 @@ endif
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)
@@ -171,7 +171,7 @@ ifeq ($(PORTNAME), hpux)
# 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 cfbd4b3d22d..2082bf294eb 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -4,7 +4,7 @@
#
# 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 $
#
#-------------------------------------------------------------------------
@@ -13,11 +13,11 @@ subdir = src/backend
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 1f120c64105..bf42037a9ff 100644
--- a/src/backend/access/Makefile
+++ b/src/backend/access/Makefile
@@ -1,15 +1,15 @@
#
# 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 0482467bbbe..026d9053a0a 100644
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -2,7 +2,7 @@
#
# 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 $
#
#-------------------------------------------------------------------------
@@ -26,7 +26,7 @@ SUBSYS.o: $(OBJS)
# 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 \
@@ -38,7 +38,7 @@ POSTGRES_BKI_SRCS := $(addprefix $(top_srcdir)/src/include/catalog/,\
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 e3f3a405d61..ef63ef11614 100644
--- a/src/backend/optimizer/Makefile
+++ b/src/backend/optimizer/Makefile
@@ -1,15 +1,15 @@
#
# 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 a9301cacaf8..06d90b2a3cc 100644
--- a/src/backend/storage/Makefile
+++ b/src/backend/storage/Makefile
@@ -1,15 +1,15 @@
#
# 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 5c3c20b815d..cd886d17fb7 100644
--- a/src/backend/utils/Makefile
+++ b/src/backend/utils/Makefile
@@ -1,15 +1,15 @@
#
# 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 39beee6654e..1ce163e9321 100644
--- a/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile
+++ b/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 3a7712687b7..dc270b41471 100644
--- a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile
+++ b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 b10f000559a..4bc4c55de4d 100644
--- a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile
+++ b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 100f46bf243..54e5b185121 100644
--- a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile
+++ b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 5dd697128bd..37be61fa9ad 100644
--- a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile
+++ b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 ccf1d66106c..0efa61fdc20 100644
--- a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile
+++ b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/Makefile
@@ -1,13 +1,13 @@
#-------------------------------------------------------------------------
#
-# $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 83abeaa4e94..c7c2b7c0e25 100644
--- a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile
+++ b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 2528f7f0dbc..99da5d74811 100644
--- a/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile
+++ b/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 0bf6263d1a9..a706b42661c 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 e5cb9e16a3b..772ebe1977d 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 bfd4e80cc76..0ff9aaf8c95 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 e81d8d3f5e4..a14326e8201 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 4a62a9fde6d..8933b8af155 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 3d45bedf571..1ebebc701f0 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 a20cda0d502..d9bf16a24de 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 20805478571..7fd1a32876f 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 8788507477a..5338e7928e2 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 b04d8f95d7d..bbdb83996f8 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 bf14250f820..7db2f359d71 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 48ef8088247..b3e479774ad 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 b0091a7d1e8..2927989bd69 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 d1872f16051..fb2ba930bfc 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 c7c6f18cdd1..8dd98059461 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile
@@ -1,12 +1,12 @@
#-------------------------------------------------------------------------
#
-# $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 16a39eea1a0..1f319d5596d 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -5,7 +5,7 @@
# 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 $
#
#-------------------------------------------------------------------------
@@ -13,7 +13,7 @@ subdir = src/bin
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 4e68bf776b8..db0e4ff6716 100644
--- a/src/interfaces/Makefile
+++ b/src/interfaces/Makefile
@@ -4,7 +4,7 @@
#
# 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 $
#
#-------------------------------------------------------------------------
@@ -12,9 +12,9 @@ subdir = src/interfaces
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 204b123aec6..e5934c6fb32 100644
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -1,4 +1,4 @@
-# $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 = ../../../..
@@ -12,7 +12,7 @@ TEMP_PORT = 5$(DEF_PGPORT)
MULTIBYTE = SQL_ASCII
# locale
-NOLOCALE :=
+NOLOCALE =
ifdef NO_LOCALE
NOLOCALE += --no-locale
endif
diff --git a/src/pl/Makefile b/src/pl/Makefile
index 573b4945577..1b4ef86a59f 100644
--- a/src/pl/Makefile
+++ b/src/pl/Makefile
@@ -4,7 +4,7 @@
#
# 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 $
#
#-------------------------------------------------------------------------
@@ -12,7 +12,7 @@ subdir = src/pl
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 11583763ff9..b91e8194909 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -1,5 +1,5 @@
# 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 = ../../..
@@ -17,9 +17,9 @@ endif
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 b0a9649be53..38092ee432f 100644
--- a/src/pl/plpgsql/src/Makefile
+++ b/src/pl/plpgsql/src/Makefile
@@ -2,7 +2,7 @@
#
# 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 $
#
#-------------------------------------------------------------------------
@@ -17,7 +17,7 @@ SO_MINOR_VERSION= 0
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 9d02f4d7f41..b9a0821c0aa 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -1,4 +1,4 @@
-# $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 = ../../..
@@ -17,15 +17,15 @@ endif
# 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 1742eb85986..5ab4dd0a780 100644
--- a/src/port/Makefile
+++ b/src/port/Makefile
@@ -15,7 +15,7 @@
# 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 $
#
#-------------------------------------------------------------------------
@@ -27,7 +27,7 @@ override CPPFLAGS := -I$(top_builddir)/src/port -DFRONTEND $(CPPFLAGS)
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 277d65ccc6b..94c4bbf9582 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -6,7 +6,7 @@
# 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 $
#
#-------------------------------------------------------------------------
@@ -14,7 +14,7 @@ subdir = src/test/regress
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)
@@ -26,13 +26,13 @@ PSQLDIR = $(bindir)
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 69e79b8536e..3af8c376f89 100644
--- a/src/timezone/Makefile
+++ b/src/timezone/Makefile
@@ -4,7 +4,7 @@
# 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 $
#
#-------------------------------------------------------------------------
@@ -12,8 +12,6 @@ subdir = src/timezone
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
-override CPPFLAGS := $(CPPFLAGS)
-
# files to build into backend
OBJS= localtime.o strftime.o pgtz.o
@@ -21,9 +19,9 @@ 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 aca2c595963..8f1c6447b64 100644
--- a/src/timezone/tznames/Makefile
+++ b/src/timezone/tznames/Makefile
@@ -4,7 +4,7 @@
# 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 $
#
#-------------------------------------------------------------------------
@@ -12,12 +12,12 @@ subdir = src/timezone/tznames
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'