timezone/Makefile makes wrong assumptions

[Andreas Schwab]

The rules to install the timezone files assumes that $(inst_zonedir) ==
$(inst_datadir)/zoneinfo.  This may be wrong if you want these files to
reside in some different location.  The following patch fixes this, except
that it still assumes that $(inst_zonedir) ends in zone*, which is
probably a reasonable assumption.

OK to commit?

Andreas.

2001-02-06  Andreas Schwab  <schwab@suse.de>

	* timezone/Makefile: Don't assume that $(inst_zonedir) is a subdir
	of $(inst_datadir).

--- timezone/Makefile.~1.19.~	Tue Oct 17 09:51:06 2000
+++ timezone/Makefile	Tue Feb  6 15:21:08 2001
@@ -104,13 +104,13 @@
 	   echo '$$(addprefix $$(inst_zonedir)/,$$($*-zones)): \'	    ;\
 	   echo '$$(foreach t,$$(tzbases),$$(addprefix $$(inst_zonedir)/,$$($$t-zones)))' ;\
 	 fi								    ;\
-	 echo '$$(addprefix $$(inst_datadir)/zone%/right/,$$($*-zones)): \' ;\
+	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/right/,$$($*-zones)): \' ;\
 	 echo '$< $$(objpfx)zic leapseconds yearistype'			    ;\
 	 echo '	$$(tzcompile)'						    ;\
-	 echo '$$(addprefix $$(inst_datadir)/zone%/posix/,$$($*-zones)): \' ;\
+	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/posix/,$$($*-zones)): \' ;\
 	 echo '$< $$(objpfx)zic /dev/null yearistype'			    ;\
 	 echo '	$$(tzcompile)'						    ;\
-	 echo '$$(addprefix $$(inst_datadir)/zone%/,$$($*-zones)): \'	    ;\
+	 echo '$$(addprefix $$(dir $$(inst_zonedir))zone%/,$$($*-zones)): \' ;\
 	 echo '$< $$(objpfx)zic $$(leapseconds) yearistype'		    ;\
 	 echo '	$$(tzcompile)'						    ;\
 	 echo 'endif'							    ;\

-- 
Andreas Schwab                                  "And now for something
SuSE Labs                                        completely different."
Andreas.Schwab@suse.de
SuSE GmbH, Schanzäckerstr. 10, D-90443 Nürnberg