mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2025-02-05 19:09:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix new timezone cross-compile rule to avoid a bug in gmake 3.78.1;

Browse Source 
document change.
This commit is contained in:
Bruce Momjian 2009-01-06 02:25:29 +00:00
parent 9f910a3b9a
commit eaa088e8ee
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/timezone/Makefile
View File

@ -4,7 +4,7 @@
# Makefile for the timezone library # Makefile for the timezone library
# IDENTIFICATION # IDENTIFICATION
# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.30 2009/01/05 10:25:59 petere Exp $ # $PostgreSQL: pgsql/src/timezone/Makefile,v 1.31 2009/01/06 02:25:29 momjian Exp $
# #
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
@ -38,12 +38,20 @@ ifeq (,$(with_system_tzdata))
all: submake-libpgport zic all: submake-libpgport zic
endif endif
# We could do this test in the action section:
# $(if $(ZIC),$(ZIC),./zic)
# but gmake versions <= 3.78.1 or perhaps later have a bug
# that causes a segfault; gmake 3.81 or later fixes this.
ifeq (,$(ZIC))
ZIC= ./zic
endif
zic: $(ZICOBJS) zic: $(ZICOBJS)
$(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X) $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X)
install: all installdirs install: all installdirs
ifeq (,$(with_system_tzdata)) ifeq (,$(with_system_tzdata))
$(if $(ZIC),$(ZIC),./zic) -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES) $(ZIC) -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES)
endif endif
$(MAKE) -C tznames $@ $(MAKE) -C tznames $@