diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.global.in | 3 | ||||
| -rw-r--r-- | src/timezone/Makefile | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in index 032da4f5791..3f81b9e786d 100644 --- a/src/Makefile.global.in +++ b/src/Makefile.global.in @@ -1,5 +1,5 @@ # -*-makefile-*- -# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.237 2007/06/26 22:05:04 tgl Exp $ +# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.238 2007/08/20 08:53:12 petere Exp $ #------------------------------------------------------------------------------ # All PostgreSQL makefiles include this file and use the variables it sets, @@ -158,6 +158,7 @@ with_openssl = @with_openssl@ with_ossp_uuid = @with_ossp_uuid@ with_libxml = @with_libxml@ with_libxslt = @with_libxslt@ +with_system_tzdata = @with_system_tzdata@ with_zlib = @with_zlib@ enable_shared = @enable_shared@ enable_rpath = @enable_rpath@ diff --git a/src/timezone/Makefile b/src/timezone/Makefile index f3d5088b4d9..f5667809f99 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.26 2007/03/14 17:38:06 tgl Exp $ +# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.27 2007/08/20 08:53:12 petere Exp $ # #------------------------------------------------------------------------- @@ -32,11 +32,17 @@ all: SUBSYS.o submake-libpgport zic SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) +ifeq (,$(with_system_tzdata)) zic: $(ZICOBJS) $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X) +endif install: all installdirs +ifeq (,$(with_system_tzdata)) ./zic -d '$(DESTDIR)$(datadir)/timezone' -p '$(POSIXRULES)' $(TZDATAFILES) +else + ln -s '$(with_system_tzdata)' '$(DESTDIR)$(datadir)/timezone' +endif $(MAKE) -C tznames $@ installdirs: |