diff options
Diffstat (limited to 'src/timezone/Makefile')
| -rw-r--r-- | src/timezone/Makefile | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/src/timezone/Makefile b/src/timezone/Makefile index fa3b9dadff8..d5fd05d0cd7 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.20 2005/07/04 19:54:51 momjian Exp $ +# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.21 2005/07/06 21:04:14 momjian Exp $ # #------------------------------------------------------------------------- @@ -18,7 +18,7 @@ override CPPFLAGS := $(CPPFLAGS) -I$(srcdir) -DNO_PGPORT OBJS= localtime.o strftime.o pgtz.o # files needed to build zic utility program -ZICOBJS= zic.o ialloc.o scheck.o localtime-zic.o +ZICOBJS= zic.o ialloc.o scheck.o localtime.o # timezone data files TZDATA := africa antarctica asia australasia europe northamerica southamerica \ @@ -30,17 +30,8 @@ all: SUBSYS.o submake-libpgport zic SUBSYS.o: $(OBJS) $(LD) $(LDREL) $(LDOUT) SUBSYS.o $(OBJS) -# In case of cross-compilation, zic needs to be built with a native -# compiler because it is run during the build, not on the final -# system. - -localtime-zic.c: localtime.c - $(LN_S) $< $@ - -$(ZICOBJS): CC=$(CC_FOR_BUILD) - zic: $(ZICOBJS) - $(CC_FOR_BUILD) $(CFLAGS) $(ZICOBJS) -o $@$(X) + $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X) install: all installdirs ./zic -d $(DESTDIR)$(datadir)/timezone $(TZDATAFILES) @@ -49,4 +40,4 @@ installdirs: $(mkinstalldirs) $(DESTDIR)$(datadir) clean distclean maintainer-clean: - rm -f SUBSYS.o zic zic$(X) $(OBJS) $(ZICOBJS) localtime-zic.c + rm -f SUBSYS.o zic$(X) $(OBJS) $(ZICOBJS) |