diff options
author | Peter Eisentraut | 2007-02-09 15:56:00 +0000 |
---|---|---|
committer | Peter Eisentraut | 2007-02-09 15:56:00 +0000 |
commit | 86f8fd104bb6696e9ee3c336807bd62f438ec9c4 (patch) | |
tree | 7f10a3daf2c2bc8b03a9d7a038b978eea3eebddb | |
parent | 2c6658b71193d49050e9e727fa14f8b7974fdfa5 (diff) |
Replace useless uses of := by = in makefiles.
46 files changed, 75 insertions, 77 deletions
diff --git a/GNUmakefile.in b/GNUmakefile.in index 00b4a21ca7..434d7af42f 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -63,9 +63,9 @@ GNUmakefile: GNUmakefile.in $(top_builddir)/config.status ########################################################################## -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) @@ -77,11 +77,11 @@ dist: $(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 0b5313f315..88abbfb7b8 100644 --- a/contrib/tsearch2/Makefile +++ b/contrib/tsearch2/Makefile @@ -9,8 +9,8 @@ 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 36c6569e47..cf5fae983e 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -27,14 +27,14 @@ include $(top_builddir)/src/Makefile.global 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 3e0b1e3027..15066e8ec6 100644 --- a/doc/src/sgml/Makefile +++ b/doc/src/sgml/Makefile @@ -66,7 +66,7 @@ override SPFLAGS += -wall -wno-unused-param -wno-empty .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' @@ -105,7 +105,7 @@ draft: @$(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 e3d0c4b4fe..649f5c702d 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -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 29d8be0305..a8578c60a2 100644 --- a/src/Makefile.shlib +++ b/src/Makefile.shlib @@ -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 da5fb213e7..a48a19092e 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -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 39b97f08cb..4e0d90562f 100644 --- a/src/backend/access/Makefile +++ b/src/backend/access/Makefile @@ -8,8 +8,8 @@ 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 c20090c7ad..33458b5e03 100644 --- a/src/backend/catalog/Makefile +++ b/src/backend/catalog/Makefile @@ -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 24f9846e0d..f2061dc8b8 100644 --- a/src/backend/optimizer/Makefile +++ b/src/backend/optimizer/Makefile @@ -8,8 +8,8 @@ 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 384f5b6fb1..c3ac007c01 100644 --- a/src/backend/storage/Makefile +++ b/src/backend/storage/Makefile @@ -8,8 +8,8 @@ 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 c31b1a765f..049a417848 100644 --- a/src/backend/utils/Makefile +++ b/src/backend/utils/Makefile @@ -8,8 +8,8 @@ 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 1b1c435117..b22915eaba 100644 --- a/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile +++ b/src/backend/utils/mb/conversion_procs/ascii_and_mic/Makefile @@ -7,6 +7,6 @@ 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 ac868851b3..4625052753 100644 --- a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile +++ b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/Makefile @@ -7,6 +7,6 @@ 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 836b7e3cac..f3821d02d2 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 @@ -7,6 +7,6 @@ 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 43f3e3f682..d0f3d3196d 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 @@ -7,6 +7,6 @@ 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 dff3a95917..fd4de467ce 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 @@ -7,6 +7,6 @@ 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 c368d42cd3..9ed67a9934 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 @@ -7,7 +7,7 @@ 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 1155d6d25a..3239956c8c 100644 --- a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile +++ b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/Makefile @@ -7,6 +7,6 @@ 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 1c318f25c1..9e7ba78eb2 100644 --- a/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile +++ b/src/backend/utils/mb/conversion_procs/latin_and_mic/Makefile @@ -7,6 +7,6 @@ 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 c02f89edf0..7690a6b162 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/Makefile @@ -7,6 +7,6 @@ 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 6ad5f11ddc..97210fb617 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_big5/Makefile @@ -7,6 +7,6 @@ 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 3ea92b0ff7..e8044d1d0d 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/Makefile @@ -7,6 +7,6 @@ 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 a763ff2662..f4df852a3e 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 @@ -7,6 +7,6 @@ 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 4dcc911fbb..c6af5b413f 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 @@ -7,6 +7,6 @@ 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 8e40e34b5e..5fb2b2b340 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 @@ -7,6 +7,6 @@ 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 2efda17fca..3482ce8707 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 @@ -7,6 +7,6 @@ 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 7c8bf7072f..b56cb22161 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/Makefile @@ -7,6 +7,6 @@ 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 c771874620..834bd9f5e8 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/Makefile @@ -7,6 +7,6 @@ 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 1f92d944e9..feced9e93b 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/Makefile @@ -7,6 +7,6 @@ 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 053a32e5d7..cf8ffa0fdf 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 @@ -7,6 +7,6 @@ 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 1754a4f204..7c4800972e 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_johab/Makefile @@ -7,6 +7,6 @@ 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 c43f568535..f906075f1b 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/Makefile @@ -7,6 +7,6 @@ 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 f108fbeadb..c3a9c4caa1 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/Makefile @@ -7,6 +7,6 @@ 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 cdbcff9333..2d6cd9a624 100644 --- a/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile +++ b/src/backend/utils/mb/conversion_procs/utf8_and_win/Makefile @@ -7,6 +7,6 @@ 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 b61a2bebc6..f1f69e1be7 100644 --- a/src/bin/Makefile +++ b/src/bin/Makefile @@ -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 134084d3da..4de35c1140 100644 --- a/src/interfaces/Makefile +++ b/src/interfaces/Makefile @@ -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 82568c7501..12a9fb0a5f 100644 --- a/src/interfaces/ecpg/test/Makefile +++ b/src/interfaces/ecpg/test/Makefile @@ -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 2ba0877d0a..b5d5d79c89 100644 --- a/src/pl/Makefile +++ b/src/pl/Makefile @@ -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 b4d617f0d5..977ce8160c 100644 --- a/src/pl/plperl/GNUmakefile +++ b/src/pl/plperl/GNUmakefile @@ -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 6d8d5b96f0..5731048d76 100644 --- a/src/pl/plpgsql/src/Makefile +++ b/src/pl/plpgsql/src/Makefile @@ -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 3038116f8f..cae77a515f 100644 --- a/src/pl/plpython/Makefile +++ b/src/pl/plpython/Makefile @@ -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 49beccefbd..d7315a2516 100644 --- a/src/port/Makefile +++ b/src/port/Makefile @@ -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 67242bb60d..0a011a99a0 100644 --- a/src/test/regress/GNUmakefile +++ b/src/test/regress/GNUmakefile @@ -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 cc9fac987a..81f1e81068 100644 --- a/src/timezone/Makefile +++ b/src/timezone/Makefile @@ -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 b2d55e79be..4691835da7 100644 --- a/src/timezone/tznames/Makefile +++ b/src/timezone/tznames/Makefile @@ -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' |