diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2005-10-27 20:45:29 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2005-10-27 20:45:29 +0000 |
| commit | 97b8013db5256f0fad4fceb4a6fc54d131ab234f (patch) | |
| tree | 363516618ee7aa1cb95542cdb8762c00fa61a818 | |
| parent | fbbe00242ddee79a6ab453300a8a7b82857af0ad (diff) | |
| download | postgresql-97b8013db5256f0fad4fceb4a6fc54d131ab234f.tar.gz postgresql-97b8013db5256f0fad4fceb4a6fc54d131ab234f.zip | |
Add an ifneq to avoid make warning on AIX --- there is a separate rule
for postgres: on line 86, and line 43 shouldn't be used. Noted while
looking at kookaburra buildfarm results.
| -rw-r--r-- | src/backend/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/backend/Makefile b/src/backend/Makefile index 1008e114418..f735039c115 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.109 2005/07/28 04:31:30 tgl Exp $ +# $PostgreSQL: pgsql/src/backend/Makefile,v 1.110 2005/10/27 20:45:29 tgl Exp $ # #------------------------------------------------------------------------- @@ -38,14 +38,17 @@ all: submake-libpgport postgres $(POSTGRES_IMP) ifneq ($(PORTNAME), cygwin) ifneq ($(PORTNAME), win32) +ifneq ($(PORTNAME), aix) postgres: $(OBJS) $(CC) $(CFLAGS) $(LDFLAGS) $(export_dynamic) $^ $(LIBS) -o $@ endif endif +endif ifeq ($(PORTNAME), cygwin) + postgres: $(OBJS) $(DLLINIT) postgres.def libpostgres.a $(DLLTOOL) --dllname $@$(X) --output-exp $@.exp --def postgres.def $(CC) $(CFLAGS) $(LDFLAGS) -o $@$(X) -Wl,--base-file,$@.base $@.exp $(OBJS) $(LIBS) @@ -78,7 +81,6 @@ libpostgres.a: postgres.def endif # win32 - ifeq ($(PORTNAME), aix) postgres: $(POSTGRES_IMP) |