diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2009-01-05 10:25:59 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2009-01-05 10:25:59 +0000 |
| commit | c63b9b1ddc374ab52086d4a0e9469220f051371d (patch) | |
| tree | 249d66138ab5aa1d0beb2cc89278dc4ee90ec746 /src | |
| parent | 46866e92bd89f1e81a2dbe45a8c1997f23f452fa (diff) | |
| download | postgresql-c63b9b1ddc374ab52086d4a0e9469220f051371d.tar.gz postgresql-c63b9b1ddc374ab52086d4a0e9469220f051371d.zip | |
When cross-compiling, allow and require an external zic program to be used
when --with-system-tzdata is not used.
initial patch by Richard Evans
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 3 | ||||
| -rw-r--r-- | src/timezone/Makefile | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 749eae5a937..343f215b03f 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.250 2009/01/05 09:54:12 petere Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.251 2009/01/05 10:25:59 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -224,6 +224,7 @@ FLEX = @FLEX@ FLEXFLAGS = @FLEXFLAGS@ $(LFLAGS) DTRACE = @DTRACE@ DTRACEFLAGS = @DTRACEFLAGS@ +ZIC = @ZIC@ # Linking diff --git a/src/timezone/Makefile b/src/timezone/Makefile index bd9a5f46940..1a5fc06d446 100644 --- a/src/timezone/Makefile +++ b/src/timezone/Makefile @@ -4,7 +4,7 @@ # Makefile for the timezone library # IDENTIFICATION -# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.29 2008/02/19 15:29:58 petere Exp $ +# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.30 2009/01/05 10:25:59 petere Exp $ # #------------------------------------------------------------------------- @@ -43,7 +43,7 @@ zic: $(ZICOBJS) install: all installdirs ifeq (,$(with_system_tzdata)) - ./zic -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES) + $(if $(ZIC),$(ZIC),./zic) -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES) endif $(MAKE) -C tznames $@ |