summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-02 13:46:01 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2009-04-02 13:46:01 +0000
commit7191a6160acc88c3b026ce95f07b6ae9ac31c76f (patch)
tree0b7cfdcbeb1e20d0dd0197033e8e35dcc548853a /Build
parent8b7b6eb852a7ca709196fb1a1de4ebe28ecc85d5 (diff)
new build system: more texk/texlive/
git-svn-id: svn://tug.org/texlive/trunk@12601 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/WARNING3
-rwxr-xr-xBuild/source/configure4
-rw-r--r--Build/source/configure.ac4
-rw-r--r--Build/source/libs/xpdf/Makefile.am4
-rw-r--r--Build/source/libs/xpdf/Makefile.in2
-rw-r--r--Build/source/texk/tetex/Makefile.am2
-rw-r--r--Build/source/texk/tetex/Makefile.in2
-rw-r--r--Build/source/texk/texlive/Makefile.am2
-rw-r--r--Build/source/texk/texlive/Makefile.in2
9 files changed, 14 insertions, 11 deletions
diff --git a/Build/source/WARNING b/Build/source/WARNING
index 0309a78d90c..d051ea2a0a4 100644
--- a/Build/source/WARNING
+++ b/Build/source/WARNING
@@ -9,11 +9,10 @@ Please inform me of any failures!
The new build system is nearly complete, except for the directories
- texk/texlive
texk/xdvik
texk/web2c/xetexdir
utils/xindy
and a few features not yet available.
-Peter Breitenlohner 2009-03-30 14:00 UTC
+Peter Breitenlohner 2009-04-02 14:00 UTC
diff --git a/Build/source/configure b/Build/source/configure
index 65edb40c658..4bb7344050e 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -20032,12 +20032,12 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
if test "x$mandir" = 'x${datarootdir}/man'; then
- mandir='${prefix}/doc/man'
+ mandir='${prefix}/texmf/doc/man'
ac_configure_args="$ac_configure_args '--mandir=$mandir'"
fi
if test "x$infodir" = 'x${datarootdir}/info'; then
- infodir='${prefix}/doc/info'
+ infodir='${prefix}/texmf/doc/info'
ac_configure_args="$ac_configure_args '--infodir=$infodir'"
fi
diff --git a/Build/source/configure.ac b/Build/source/configure.ac
index 0b434ed73fd..48dec5fed29 100644
--- a/Build/source/configure.ac
+++ b/Build/source/configure.ac
@@ -51,12 +51,12 @@ AC_PATH_XTRA
AC_PROG_CXX
if test "x$mandir" = 'x${datarootdir}/man'; then
- mandir='${prefix}/doc/man'
+ mandir='${prefix}/texmf/doc/man'
ac_configure_args="$ac_configure_args '--mandir=$mandir'"
fi
if test "x$infodir" = 'x${datarootdir}/info'; then
- infodir='${prefix}/doc/info'
+ infodir='${prefix}/texmf/doc/info'
ac_configure_args="$ac_configure_args '--infodir=$infodir'"
fi
diff --git a/Build/source/libs/xpdf/Makefile.am b/Build/source/libs/xpdf/Makefile.am
index 08ddee8abee..6798ad21e2b 100644
--- a/Build/source/libs/xpdf/Makefile.am
+++ b/Build/source/libs/xpdf/Makefile.am
@@ -115,3 +115,7 @@ EXTRA_DIST += xpdf-3.02-pdftex.patch
EXTRA_DIST += xpdf-3.02-time_h.patch
+## Patch required for some mingw32
+
+EXTRA_DIST += xpdf-3.02-mingw32.patch
+
diff --git a/Build/source/libs/xpdf/Makefile.in b/Build/source/libs/xpdf/Makefile.in
index 744643ab26f..24782dfc4ba 100644
--- a/Build/source/libs/xpdf/Makefile.in
+++ b/Build/source/libs/xpdf/Makefile.in
@@ -214,7 +214,7 @@ top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
EXTRA_DIST = $(XPDF_TREE) xpdf-3.02-pl2.patch \
xpdf-3.02-PDF_PARSER_ONLY.patch xpdf-3.02-pdftex.patch \
- xpdf-3.02-time_h.patch
+ xpdf-3.02-time_h.patch xpdf-3.02-mingw32.patch
SUBDIRS = goo fofi xpdf
GOO_SRC = $(top_srcdir)/$(XPDF_TREE)/goo
FOFI_SRC = $(top_srcdir)/$(XPDF_TREE)/fofi
diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am
index 43d5b19c6b0..bbf13114a68 100644
--- a/Build/source/texk/tetex/Makefile.am
+++ b/Build/source/texk/tetex/Makefile.am
@@ -110,6 +110,7 @@ install-data-hook:
&& rm -f allec.1 ctangle.1 cweave.1 fmtutil-sys.1 kpsexpand.1 \
kpsepath.1 lambda.1 mf-nowin.1 mktexfmt.1 odvicopy.1 \
odvitype.1 pdflatex.1 texconfig-sys.1 texhash.1 updmap-sys.1 \
+ && $(LN_S) aleph.1 lambda.1 \
&& $(LN_S) allcm.1 allec.1 \
&& $(LN_S) cweb.1 ctangle.1 \
&& $(LN_S) cweb.1 cweave.1 \
@@ -121,7 +122,6 @@ install-data-hook:
&& $(LN_S) kpsetool.1 kpsepath.1 \
&& $(LN_S) mf.1 mf-nowin.1 \
&& $(LN_S) mktexlsr.1 texhash.1 \
- && $(LN_S) omega.1 lambda.1 \
&& $(LN_S) pdftex.1 pdflatex.1 \
&& $(LN_S) texconfig.1 texconfig-sys.1 \
&& $(LN_S) updmap.1 updmap-sys.1
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index c56aa86d9ba..046f36313be 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -761,6 +761,7 @@ install-data-hook:
&& rm -f allec.1 ctangle.1 cweave.1 fmtutil-sys.1 kpsexpand.1 \
kpsepath.1 lambda.1 mf-nowin.1 mktexfmt.1 odvicopy.1 \
odvitype.1 pdflatex.1 texconfig-sys.1 texhash.1 updmap-sys.1 \
+ && $(LN_S) aleph.1 lambda.1 \
&& $(LN_S) allcm.1 allec.1 \
&& $(LN_S) cweb.1 ctangle.1 \
&& $(LN_S) cweb.1 cweave.1 \
@@ -772,7 +773,6 @@ install-data-hook:
&& $(LN_S) kpsetool.1 kpsepath.1 \
&& $(LN_S) mf.1 mf-nowin.1 \
&& $(LN_S) mktexlsr.1 texhash.1 \
- && $(LN_S) omega.1 lambda.1 \
&& $(LN_S) pdftex.1 pdflatex.1 \
&& $(LN_S) texconfig.1 texconfig-sys.1 \
&& $(LN_S) updmap.1 updmap-sys.1
diff --git a/Build/source/texk/texlive/Makefile.am b/Build/source/texk/texlive/Makefile.am
index 8fe13d769b4..39ed0f0e9e4 100644
--- a/Build/source/texk/texlive/Makefile.am
+++ b/Build/source/texk/texlive/Makefile.am
@@ -39,7 +39,7 @@ EXTRA_DIST = \
lambda lamstex.bat \
latex \
lollipop.bat \
- mex \mex.bat \
+ mex mex.bat \
mex-pl.bat \
mllatex mllatex.bat \
mltex mltex.bat \
diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in
index 07de8b73f2d..53b1d840679 100644
--- a/Build/source/texk/texlive/Makefile.in
+++ b/Build/source/texk/texlive/Makefile.in
@@ -169,7 +169,7 @@ EXTRA_DIST = amstex amstex.bat blue.bat cont-cz.bat cont-de \
csplaini.bat csplaink.bat einitex elatex elatex.bat eplain \
eplain.bat evirtex giftopng hugelatex hugelatex.bat hugetex \
hugetex.bat inimf inimpost iniomega initex jadetex jadetex.bat \
- lambda lamstex.bat latex lollipop.bat mex \mex.bat mex-pl.bat \
+ lambda lamstex.bat latex lollipop.bat mex mex.bat mex-pl.bat \
mllatex mllatex.bat mltex mltex.bat mptopdf nts pdfcslatex \
pdfcslatex.bat pdfcslatexd.bat pdfcslatexi.bat pdfcslatexk.bat \
pdfcsplain pdfcsplain.bat pdfcsplaind.bat pdfcsplaini.bat \