diff options
| author | Bruce Momjian | 2004-04-30 17:52:07 +0000 |
|---|---|---|
| committer | Bruce Momjian | 2004-04-30 17:52:07 +0000 |
| commit | 1360fe409654858d77096a7d83b15a550b9b6c85 (patch) | |
| tree | ddf980f52ce28501365367be6f26d5968744ec4d /src/timezone | |
| parent | 46050a3b7589a83c41dc4a693d64e73c1dac2e85 (diff) | |
More timezone build adjustments.
Diffstat (limited to 'src/timezone')
| -rw-r--r-- | src/timezone/Makefile | 4 | ||||
| -rw-r--r-- | src/timezone/private.h | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/timezone/Makefile b/src/timezone/Makefile index 631f81f169..22639a4e4a 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.4 2004/04/30 16:08:01 momjian Exp $ +# $PostgreSQL: pgsql/src/timezone/Makefile,v 1.5 2004/04/30 17:52:07 momjian Exp $ # #------------------------------------------------------------------------- @@ -30,7 +30,7 @@ zic: $(ZICOBJS) $(CC) $(CFLAGS) $(ZICOBJS) $(LDFLAGS) $(LIBS) -o $@$(X) install: zic - zic -d $(datadir)/timezone $(TZDATAFILES) + zic -d $(pkglibdir)/../timezone $(TZDATAFILES) clean distclean maintainer-clean: rm -f SUBSYS.o $(OBJS) $(ZICOBJS) diff --git a/src/timezone/private.h b/src/timezone/private.h index 4c94b2d21e..c8f4548683 100644 --- a/src/timezone/private.h +++ b/src/timezone/private.h @@ -88,11 +88,7 @@ static char privatehid[] = "@(#)private.h 7.53"; #include "errno.h" #include "string.h" #include "limits.h" /* for CHAR_BIT */ -#define _timezone timezone -#undef timezone #include "time.h" -#define timezone _timezone -#undef _timezone #include "stdlib.h" #if HAVE_GETTEXT - 0 |