various enhancements

SCCS-file: Makefile
SCCS-SID: 1.6

Makefile

@@ -1,44 +1,47 @@
 # %W%
 
+# Use an absolute path name for TZDIR unless you're just testing the software.
+
+TZDIR=		/usr/local/lib/tzdir
+DEBUG=
 LINTFLAGS=	-phbaaxc
+LFLAGS=
+CFLAGS=		$(DEBUG) -DOBJECTID -DTZDIR=\"$(TZDIR)\"
 
-CFLAGS=		-g -DOBJECTID 
-
-TZCFLAGS=	-d tzdir	# Remove this line to put files in /etc/tzdir
 TZCSRCS=	tzcomp.c scheck.c strchr.c
 TZCOBJS=	tzcomp.o scheck.o strchr.o
+ENCHILADA=	Makefile timezone.h settz.c tzdump.c $(TZCSRCS) tzinfo years.sh
 
-ENCHILADA=	Makefile timezone.h settz.c tzdump.c $(TZCSRCS) tzinfo types.sh
+all:	data tzdump
 
-ALL=		tzdump tzcomp uspres nonpres
-
-all:	$(ALL)
-
-data:	tzcomp tzinfo
-	tzcomp $(TZCFLAGS) tzinfo
-
-uspres nonpres:	types.sh
-	cp $? $@
-	chmod +x $@
+data:	$(TZDIR) tzcomp tzinfo years
+		tzcomp -d $(TZDIR) tzinfo
 
 tzdump:	tzdump.o settz.o
-		$(CC) $(CFLAGS) tzdump.o settz.o $(LIBS) -o $@
+		$(CC) $(LFLAGS) tzdump.o settz.o $(LIBS) -o $@
 
 tzcomp:	$(TZCOBJS)
-		$(CC) $(CFLAGS) $(TZCOBJS) $(LIBS) -o $@
+		$(CC) $(LFLAGS) $(TZCOBJS) $(LIBS) -o $@
+
+$(TZDIR):
+		mkdir $@
+
+years:	years.sh
+		cp $? $@
+		chmod 555 $@
 
 bundle:	$(ENCHILADA)
-	bundle $(ENCHILADA) > bundle
+		bundle $(ENCHILADA) > bundle
 
 $(ENCHILADA):
 		sccs get $(REL) $(REV) $@
 
-sure:	tzdump.c settz.c
+sure:	tzdump.c $(TZCSRCS)
 		lint $(LINTFLAGS) tzdump.c settz.c
 		lint $(LINTFLAGS) $(TZCSRCS)
 
 clean:
-		rm -f core *.o *.out $(ALL) bundle \#*
+		rm -f core *.o *.out years tzdump tzcomp bundle \#*
 
 CLEAN:	clean
 		sccs clean