diff options
| author | Bruce Momjian | 2009-01-06 02:25:29 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2009-01-06 02:25:29 +0000 |
| commit | 6f674dc535e7ecb015966e25a81b9bdad3b4b8b4 (patch) | |
| tree | 65f935f621ff83f8b6d4ce87e994fc281061140c | |
| parent | ab5aad3c30585ae3ce773e989a85d38d9c50047a (diff) | |
Fix new timezone cross-compile rule to avoid a bug in gmake 3.78.1;
document change.
| -rw-r--r-- | src/timezone/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/timezone/Makefile b/src/timezone/Makefile index 728584f2e3..eabf327bb1 100644 --- a/src/timezone/Makefile +++ b/src/timezone/Makefile @@ -38,12 +38,20 @@ ifeq (,$(with_system_tzdata)) all: submake-libpgport zic 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) $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X) install: all installdirs ifeq (,$(with_system_tzdata)) - $(if $(ZIC),$(ZIC),./zic) -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES) + $(ZIC) -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES) endif $(MAKE) -C tznames $@ |