From 35b7951778498aa1565fcc6ec7ed56201bfb6cd2 Mon Sep 17 00:00:00 2001
From: momjian <momjian>
Date: Tue, 6 Jan 2009 02:25:29 +0000
Subject: [PATCH] Fix new timezone cross-compile rule to avoid a bug in gmake
 3.78.1; document change.

---
 src/timezone/Makefile | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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 $@
 
-- 
2.11.4.GIT