Documentation makefile adjusted for new directory structure

git-svn-id: svn://tug.org/texlive/trunk@9397 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 17 insertions, 7 deletions

diff --git a/Master/texmf-doc/source/texlive/texlive-en/Makefile b/Master/texmf-doc/source/texlive/texlive-en/Makefile
index af13993dfc1..d95224d48e9 100644
--- a/Master/texmf-doc/source/texlive/texlive-en/Makefile
+++ b/Master/texmf-doc/source/texlive/texlive-en/Makefile
@@ -1,10 +1,11 @@
 # $Id$
 # Makefile for TeX Live documentation.  Public domain.
 doc = live
+lang = english
 
 all: pdf html
 
-env = TEXINPUTS=../../general/texlive-common:; export TEXINPUTS;
+env = TEXINPUTS=../texlive-common:; export TEXINPUTS;
 
 pdf:
 	rm -f *.aux *.toc *.lof *.lot *.xref* *.tmp *.out
@@ -13,7 +14,7 @@ pdf:
 	$(env) pdflatex '\nonstopmode\def\Status{1}\input $(doc)'
 	$(env) pdflatex '\nonstopmode\def\Status{1}\input $(doc)'
 
-html:  
+html:
 	rm -f *.aux *.toc *.lof *.lot *.xref* *.tmp *.out *.4tc
 # this sequence is equivalent to running "ht latex $(doc)".  We do it
 # this way so we can \def\Status for the \ifcase in tex-live.sty.
@@ -24,7 +25,7 @@ html:
 	$(env) tex4ht $(doc)
 	$(env) t4ht $(doc)
 
-clean: 
+clean:
 	rm -f *.aux *.log *.blg *.toc *.out *.lot tex4ht.ps *.4*
 	rm -f *.xref* *.lg *.idv *.out *.otc *.tmp tmp.*
 	rm -f live.dvi live.ps
@@ -36,15 +37,24 @@ realclean: clean
 
 insttop = ../../../doc
 instfiles = live*html live.css live.pdf
+copyfiles = *.png
 install:
-	lang=`dirname \`pwd\` | sed 's,.*/,,'`; \
+#	lang=`dirname \`pwd\` | sed 's,.*/,,'`;
+	lang=$(lang); \
 	tldir=`pwd | sed 's,.*/,,'`; \
-        instdir=$(insttop)/$$lang/$$tldir; \
+	instdir=$(insttop)/$$lang/$$tldir; \
 	echo tldoc install to $$instdir; \
 	for f in $(instfiles); do \
 	  cmp -s $$f $$instdir/$$f && rm -v $$f && continue; \
 	  mv -v $$f $$instdir/$$f; \
 	done; echo "$$instdir"
+	lang=$(lang); \
+	tldir=`pwd | sed 's,.*/,,'`; \
+	instdir=$(insttop)/$$lang/$$tldir; \
+	for f in $(copyfiles); do \
+	  cmp -s $$f $$instdir/$$f && continue; \
+	  cp -v $$f $$instdir/$$f; \
+	done; echo "$$instdir"
 
 
 # don't use these, they don't work.
@@ -54,13 +64,13 @@ dvi:
 	latex '\nonstopmode\def\Status{0}\input $(doc)'
 	latex '\nonstopmode\def\Status{0}\input $(doc)'
 
-baskerville:  
+baskerville:
 	rm -f *.aux *.toc
 	latex '\def\Status{3}\input $(doc)'
 	latex '\def\Status{3}\input $(doc)'
 	latex '\def\Status{3}\input $(doc)'
 
-tugboat:  
+tugboat:
 	rm -f *.aux *.toc
 	latex '\def\Status{4}\input $(doc)'
 	latex '\def\Status{4}\input $(doc)'