diff options
author | Karl Berry <karl@freefriends.org> | 2008-05-29 20:59:08 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-05-29 20:59:08 +0000 |
commit | 6cd8ea7a508a2ba919634750b7bcb3409f6e39f3 (patch) | |
tree | ba49bf34f27a6e1dd54c7a98e3d33ae720294432 /Build/source/texk/make | |
parent | 83a925beac351c221bc8499021eaf8568a758801 (diff) |
remove texmf.in, just use slave copy of texmf.cnf; consequently simplify paths.h generation
git-svn-id: svn://tug.org/texlive/trunk@8409 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/make')
-rw-r--r-- | Build/source/texk/make/ChangeLog | 4 | ||||
-rw-r--r-- | Build/source/texk/make/paths.mk | 15 | ||||
-rw-r--r-- | Build/source/texk/make/tkpathsea.mk | 5 |
3 files changed, 13 insertions, 11 deletions
diff --git a/Build/source/texk/make/ChangeLog b/Build/source/texk/make/ChangeLog index d34be793a7f..95c644a5e89 100644 --- a/Build/source/texk/make/ChangeLog +++ b/Build/source/texk/make/ChangeLog @@ -1,3 +1,7 @@ +2008-05-29 Karl Berry <karl@tug.org> + + * tkpathsea.mk: no more texmf.in, use texmf.cnf instead. + 2008-03-05 Karl Berry <karl@tug.org> * makevars.mk: pass sysconfdir, localstatedir, libexecdir. diff --git a/Build/source/texk/make/paths.mk b/Build/source/texk/make/paths.mk index 571b6c4593c..91248a71359 100644 --- a/Build/source/texk/make/paths.mk +++ b/Build/source/texk/make/paths.mk @@ -1,8 +1,5 @@ # paths.mk -- installation directories. -# -# The compile-time paths are defined in kpathsea/paths.h, which is built -# from kpathsea/texmf.in and these definitions. See kpathsea/INSTALL -# for how the various path-related files are used and created. +# $Id$ # Do not change prefix and exec_prefix in Makefile.in! # configure doesn't propagate the change to the other Makefiles. @@ -49,10 +46,10 @@ libexecdir = @libexecdir@ # TeX system-specific directories. Not all of the following are relevant # for all programs, but it seems cleaner to collect everything in one place. -# The default paths are now in kpathsea/texmf.in. Passing all the -# paths to sub-makes can make the arg list too long on system V. -# Note that if you make changes below, you will have to make the -# corresponding changes to texmf.in or texmf.cnf yourself. +# The default paths are in kpathsea/texmf.cnf. Passing all the paths to +# sub-makes can make the arg list too long. If you make +# changes below, you will have to make the corresponding changes to +# texmf.cnf yourself. # The root of the main tree. texmf = @texmfmain@ @@ -101,6 +98,6 @@ psheaderdir = $(dvipsdir) # overridden by the envvar TEXSIZES, and by a program-specific variable # (e.g., XDVISIZES), and perhaps by a config file (e.g., in dvips). # This list must be sorted in ascending order. -default_texsizes = 300:600 +default_texsizes = 600 # End of paths.mk. diff --git a/Build/source/texk/make/tkpathsea.mk b/Build/source/texk/make/tkpathsea.mk index b337ce1858f..fdeb2a3cbb4 100644 --- a/Build/source/texk/make/tkpathsea.mk +++ b/Build/source/texk/make/tkpathsea.mk @@ -1,12 +1,13 @@ # tkpathsea.mk -- target for remaking kpathsea. +# $Id$ makeargs = $(MFLAGS) CC='$(CC)' CFLAGS='$(CFLAGS)' $(XMAKEARGS) # This is wrong: the library doesn't depend on kpsewhich.c or # acconfig.h. But what to do? $(kpathsea): $(kpathsea_srcdir)/*.c $(kpathsea_srcdir)/*.h \ - $(kpathsea_srcdir)/texmf.in $(top_srcdir)/../make/paths.mk + $(top_srcdir)/../make/paths.mk cd $(kpathsea_dir) && $(MAKE) $(makeargs) -$(kpathsea_dir)/paths.h: $(kpathsea_srcdir)/texmf.in +$(kpathsea_dir)/paths.h: $(kpathsea_srcdir)/texmf.cnf cd $(kpathsea_dir) && $(MAKE) $(makeargs) # End of tkpathsea.mk. |