summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2010-12-22 12:48:01 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2010-12-22 12:48:01 +0000
commit4bd653572e321c0a03ec5d592861c60d56e9aaf2 (patch)
treebd924517ca902afff92c20dbe408453259ac198e
parent641043475e966fe7c5f803d2b96a37cb281a52e2 (diff)
move context manpages to texlive
WIN32: skip tetex and contex shell scripts git-svn-id: svn://tug.org/texlive/trunk@20827 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/tetex/ChangeLog6
-rw-r--r--Build/source/texk/tetex/Makefile.am11
-rw-r--r--Build/source/texk/tetex/Makefile.in78
-rw-r--r--Build/source/texk/tetex/aclocal.m41
-rwxr-xr-xBuild/source/texk/tetex/configure62
-rw-r--r--Build/source/texk/tetex/configure.ac5
-rw-r--r--Build/source/texk/texlive/ChangeLog8
-rw-r--r--Build/source/texk/texlive/Makefile.in3
-rw-r--r--Build/source/texk/texlive/aclocal.m41
-rwxr-xr-xBuild/source/texk/texlive/configure62
-rw-r--r--Build/source/texk/texlive/configure.ac3
-rw-r--r--Build/source/texk/texlive/context/Makefile.am13
-rw-r--r--Build/source/texk/texlive/context/Makefile.in130
-rw-r--r--Build/source/texk/texlive/context/ctxtools.man (renamed from Build/source/texk/tetex/context/ctxtools.man)0
-rw-r--r--Build/source/texk/texlive/context/mptopdf.man (renamed from Build/source/texk/tetex/context/mptopdf.man)0
-rw-r--r--Build/source/texk/texlive/context/pstopdf.man (renamed from Build/source/texk/tetex/context/pstopdf.man)0
-rw-r--r--Build/source/texk/texlive/context/texexec.man (renamed from Build/source/texk/tetex/context/texexec.man)0
-rw-r--r--Build/source/texk/texlive/context/texmfstart.man (renamed from Build/source/texk/tetex/context/texmfstart.man)0
-rw-r--r--Build/source/texk/texlive/linked_scripts/Makefile.in3
19 files changed, 301 insertions, 85 deletions
diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog
index 54005de9eca..922a71b0e92 100644
--- a/Build/source/texk/tetex/ChangeLog
+++ b/Build/source/texk/tetex/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Added KPSE_CHECK_WIN32.
+ * context/ (removed): Files moved to ../texlive/context/.
+ * Makefile.am: Adapted.
+
2010-12-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* ps4pdf: Removed, replaced by newer version under ../texlive/.
diff --git a/Build/source/texk/tetex/Makefile.am b/Build/source/texk/tetex/Makefile.am
index b8670a60b3b..16e28de2108 100644
--- a/Build/source/texk/tetex/Makefile.am
+++ b/Build/source/texk/tetex/Makefile.am
@@ -5,6 +5,7 @@
##
ACLOCAL_AMFLAGS = -I ../../m4
+if !WIN32
dist_bin_SCRIPTS = \
allcm \
allneeded \
@@ -25,16 +26,12 @@ dist_bin_SCRIPTS = \
texlinks \
updmap \
updmap-sys
+endif !WIN32
dist_man1_MANS = \
allcm.man \
allec.man \
allneeded.man \
- context/ctxtools.man \
- context/mptopdf.man \
- context/pstopdf.man \
- context/texexec.man \
- context/texmfstart.man \
dvi2fax.man \
dvired.man \
e2pall.man \
@@ -96,6 +93,7 @@ man1_links = $(bin_links) \
updmap:updmap-sys
install-exec-hook:
+if !WIN32
@cd $(DESTDIR)$(bindir) && \
for s in $(bin_links); do \
link=`echo $$s | sed 's,.*:,,'`; \
@@ -104,6 +102,7 @@ install-exec-hook:
echo "creating link '$$link' -> '$$file'"; \
$(LN_S) $$file $$link; \
done
+endif !WIN32
install-data-hook:
@cd $(DESTDIR)$(man1dir) && \
@@ -116,10 +115,12 @@ install-data-hook:
done
uninstall-hook:
+if !WIN32
@for s in $(bin_links); do \
link=`echo $$s | sed 's,.*:,,'`; \
rm -f $(DESTDIR)$(bindir)/$$link; \
done
+endif !WIN32
@for s in $(man1_links); do \
link=`echo $$s | sed 's,.*:,,'`; \
rm -f $(DESTDIR)$(man1dir)/$$link.1; \
diff --git a/Build/source/texk/tetex/Makefile.in b/Build/source/texk/tetex/Makefile.in
index 906d0b5aea6..e4588fb2b13 100644
--- a/Build/source/texk/tetex/Makefile.in
+++ b/Build/source/texk/tetex/Makefile.in
@@ -34,7 +34,7 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = .
-DIST_COMMON = $(am__configure_deps) $(dist_bin_SCRIPTS) \
+DIST_COMMON = $(am__configure_deps) $(am__dist_bin_SCRIPTS_DIST) \
$(dist_man1_MANS) $(dist_man5_MANS) $(dist_tetexdoc_DATA) \
$(dist_texconfig_DATA) $(dist_texconfig_SCRIPTS) \
$(dist_web2c_DATA) $(nobase_dist_texconf_DATA) \
@@ -46,7 +46,8 @@ DIST_COMMON = $(am__configure_deps) $(dist_bin_SCRIPTS) \
../../build-aux/ltmain.sh ../../build-aux/missing \
../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -54,6 +55,10 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+am__dist_bin_SCRIPTS_DIST = allcm allneeded dvi2fax dvired fmtutil \
+ fmtutil-sys fontinst kpsetool kpsewhere ps2frag pslatex \
+ rubibtex rumakeindex texconfig texconfig-dialog texconfig-sys \
+ texlinks updmap updmap-sys
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -185,36 +190,31 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I ../../m4
-dist_bin_SCRIPTS = \
- allcm \
- allneeded \
- dvi2fax \
- dvired \
- fmtutil \
- fmtutil-sys \
- fontinst \
- kpsetool \
- kpsewhere \
- ps2frag \
- pslatex \
- rubibtex \
- rumakeindex \
- texconfig \
- texconfig-dialog \
- texconfig-sys \
- texlinks \
- updmap \
- updmap-sys
+@WIN32_FALSE@dist_bin_SCRIPTS = \
+@WIN32_FALSE@ allcm \
+@WIN32_FALSE@ allneeded \
+@WIN32_FALSE@ dvi2fax \
+@WIN32_FALSE@ dvired \
+@WIN32_FALSE@ fmtutil \
+@WIN32_FALSE@ fmtutil-sys \
+@WIN32_FALSE@ fontinst \
+@WIN32_FALSE@ kpsetool \
+@WIN32_FALSE@ kpsewhere \
+@WIN32_FALSE@ ps2frag \
+@WIN32_FALSE@ pslatex \
+@WIN32_FALSE@ rubibtex \
+@WIN32_FALSE@ rumakeindex \
+@WIN32_FALSE@ texconfig \
+@WIN32_FALSE@ texconfig-dialog \
+@WIN32_FALSE@ texconfig-sys \
+@WIN32_FALSE@ texlinks \
+@WIN32_FALSE@ updmap \
+@WIN32_FALSE@ updmap-sys
dist_man1_MANS = \
allcm.man \
allec.man \
allneeded.man \
- context/ctxtools.man \
- context/mptopdf.man \
- context/pstopdf.man \
- context/texexec.man \
- context/texmfstart.man \
dvi2fax.man \
dvired.man \
e2pall.man \
@@ -838,14 +838,14 @@ uninstall-man: uninstall-man1 uninstall-man5
install-exec-hook:
- @cd $(DESTDIR)$(bindir) && \
- for s in $(bin_links); do \
- link=`echo $$s | sed 's,.*:,,'`; \
- file=`echo $$s | sed 's,:.*,,'`; \
- rm -f $$link; \
- echo "creating link '$$link' -> '$$file'"; \
- $(LN_S) $$file $$link; \
- done
+@WIN32_FALSE@ @cd $(DESTDIR)$(bindir) && \
+@WIN32_FALSE@ for s in $(bin_links); do \
+@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@ file=`echo $$s | sed 's,:.*,,'`; \
+@WIN32_FALSE@ rm -f $$link; \
+@WIN32_FALSE@ echo "creating link '$$link' -> '$$file'"; \
+@WIN32_FALSE@ $(LN_S) $$file $$link; \
+@WIN32_FALSE@ done
install-data-hook:
@cd $(DESTDIR)$(man1dir) && \
@@ -858,10 +858,10 @@ install-data-hook:
done
uninstall-hook:
- @for s in $(bin_links); do \
- link=`echo $$s | sed 's,.*:,,'`; \
- rm -f $(DESTDIR)$(bindir)/$$link; \
- done
+@WIN32_FALSE@ @for s in $(bin_links); do \
+@WIN32_FALSE@ link=`echo $$s | sed 's,.*:,,'`; \
+@WIN32_FALSE@ rm -f $(DESTDIR)$(bindir)/$$link; \
+@WIN32_FALSE@ done
@for s in $(man1_links); do \
link=`echo $$s | sed 's,.*:,,'`; \
rm -f $(DESTDIR)$(man1dir)/$$link.1; \
diff --git a/Build/source/texk/tetex/aclocal.m4 b/Build/source/texk/tetex/aclocal.m4
index 76a153698ad..f2dd15ba72f 100644
--- a/Build/source/texk/tetex/aclocal.m4
+++ b/Build/source/texk/tetex/aclocal.m4
@@ -989,3 +989,4 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([../../m4/kpse-win32.m4])
diff --git a/Build/source/texk/tetex/configure b/Build/source/texk/tetex/configure
index c2c6007cfaf..41b7e6a67f5 100755
--- a/Build/source/texk/tetex/configure
+++ b/Build/source/texk/tetex/configure
@@ -569,6 +569,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+WIN32_FALSE
+WIN32_TRUE
LN_S
am__fastdepCC_FALSE
am__fastdepCC_TRUE
@@ -3322,6 +3324,62 @@ $as_echo "no" >&6; }
fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
+$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
+if ${kpse_cv_have_win32+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef WIN32
+ choke me
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef __MINGW32__
+ choke me
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_have_win32=mingw32
+else
+ kpse_cv_have_win32=native
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ kpse_cv_have_win32=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
+$as_echo "$kpse_cv_have_win32" >&6; }
+
+ if test "x$kpse_cv_have_win32" != xno; then
+ WIN32_TRUE=
+ WIN32_FALSE='#'
+else
+ WIN32_TRUE='#'
+ WIN32_FALSE=
+fi
+
+
ac_config_files="$ac_config_files Makefile"
@@ -3490,6 +3548,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
+ as_fn_error $? "conditional \"WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
diff --git a/Build/source/texk/tetex/configure.ac b/Build/source/texk/tetex/configure.ac
index 8b20c1c3aee..c2e6d993be6 100644
--- a/Build/source/texk/tetex/configure.ac
+++ b/Build/source/texk/tetex/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
+dnl Copyright (C) 2009, 2010 Peter Breitenlohner <tex-live@tug.org>
dnl
dnl This file is free software; the copyright holder
dnl gives unlimited permission to copy and/or distribute it,
@@ -20,6 +20,9 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
+KPSE_CHECK_WIN32
+AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
+
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog
index 889fe04b7cc..1902caca3b8 100644
--- a/Build/source/texk/texlive/ChangeLog
+++ b/Build/source/texk/texlive/ChangeLog
@@ -1,3 +1,11 @@
+2010-12-22 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * configure.ac: Added KPSE_CHECK_WIN32.
+ * context/{ctxtools,mptopdf,pstopdf,texexec,texmfstart}.man:
+ Moved from ../tetex/context/ to here.
+ * context/Makefile.am: Adapted.
+ For WIN32 skip the shell scripts.
+
2010-05-30 Karl Berry <karl@tug.org>
* configure.ac: add context subdir, 2010.
diff --git a/Build/source/texk/texlive/Makefile.in b/Build/source/texk/texlive/Makefile.in
index b646b2d1333..b0dc2dedc13 100644
--- a/Build/source/texk/texlive/Makefile.in
+++ b/Build/source/texk/texlive/Makefile.in
@@ -41,7 +41,8 @@ DIST_COMMON = $(am__configure_deps) \
../../build-aux/ltmain.sh ../../build-aux/missing \
../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
diff --git a/Build/source/texk/texlive/aclocal.m4 b/Build/source/texk/texlive/aclocal.m4
index 76a153698ad..f2dd15ba72f 100644
--- a/Build/source/texk/texlive/aclocal.m4
+++ b/Build/source/texk/texlive/aclocal.m4
@@ -989,3 +989,4 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([../../m4/kpse-win32.m4])
diff --git a/Build/source/texk/texlive/configure b/Build/source/texk/texlive/configure
index 0b87a544c6b..f7854642805 100755
--- a/Build/source/texk/texlive/configure
+++ b/Build/source/texk/texlive/configure
@@ -569,6 +569,8 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+WIN32_FALSE
+WIN32_TRUE
LN_S
am__fastdepCC_FALSE
am__fastdepCC_TRUE
@@ -3321,6 +3323,62 @@ $as_echo "no" >&6; }
fi
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native WIN32 or MINGW32" >&5
+$as_echo_n "checking for native WIN32 or MINGW32... " >&6; }
+if ${kpse_cv_have_win32+:} false; then :
+ $as_echo_n "(cached) " >&6
+else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef WIN32
+ choke me
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#ifndef __MINGW32__
+ choke me
+#endif
+int
+main ()
+{
+
+ ;
+ return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+ kpse_cv_have_win32=mingw32
+else
+ kpse_cv_have_win32=native
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+else
+ kpse_cv_have_win32=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_have_win32" >&5
+$as_echo "$kpse_cv_have_win32" >&6; }
+
+ if test "x$kpse_cv_have_win32" != xno; then
+ WIN32_TRUE=
+ WIN32_FALSE='#'
+else
+ WIN32_TRUE='#'
+ WIN32_FALSE=
+fi
+
+
ac_config_files="$ac_config_files Makefile context/Makefile linked_scripts/Makefile"
@@ -3489,6 +3547,10 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
+if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then
+ as_fn_error $? "conditional \"WIN32\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
: "${CONFIG_STATUS=./config.status}"
ac_write_fail=0
diff --git a/Build/source/texk/texlive/configure.ac b/Build/source/texk/texlive/configure.ac
index 1199ef9a359..afbca8f6ea2 100644
--- a/Build/source/texk/texlive/configure.ac
+++ b/Build/source/texk/texlive/configure.ac
@@ -20,6 +20,9 @@ AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
+KPSE_CHECK_WIN32
+AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno])
+
AC_CONFIG_FILES([Makefile context/Makefile linked_scripts/Makefile])
AC_OUTPUT
diff --git a/Build/source/texk/texlive/context/Makefile.am b/Build/source/texk/texlive/context/Makefile.am
index 3867372185a..9c774badf4d 100644
--- a/Build/source/texk/texlive/context/Makefile.am
+++ b/Build/source/texk/texlive/context/Makefile.am
@@ -9,10 +9,9 @@
##
## Because mptopdf.pl is not part of the context/stubs directory, it is
## handled through a symlink, see ../linked_scripts.
-##
-ACLOCAL_AMFLAGS = -I ../../m4
-bin_SCRIPTS = \
+if !WIN32
+dist_bin_SCRIPTS = \
context \
ctxtools \
luatools \
@@ -21,6 +20,12 @@ bin_SCRIPTS = \
rlxtools \
texexec \
texmfstart
+endif !WIN32
-EXTRA_DIST = $(bin_SCRIPTS)
+dist_man1_MANS = \
+ ctxtools.man \
+ mptopdf.man \
+ pstopdf.man \
+ texexec.man \
+ texmfstart.man
diff --git a/Build/source/texk/texlive/context/Makefile.in b/Build/source/texk/texlive/context/Makefile.in
index 36bf15629ae..60c2ad627c0 100644
--- a/Build/source/texk/texlive/context/Makefile.in
+++ b/Build/source/texk/texlive/context/Makefile.in
@@ -33,14 +33,18 @@ NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
subdir = context
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(am__dist_bin_SCRIPTS_DIST) $(dist_man1_MANS) \
+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+am__dist_bin_SCRIPTS_DIST = context ctxtools luatools mtxrun pstopdf \
+ rlxtools texexec texmfstart
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -62,10 +66,13 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(bindir)"
-SCRIPTS = $(bin_SCRIPTS)
+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
+SCRIPTS = $(dist_bin_SCRIPTS)
SOURCES =
DIST_SOURCES =
+man1dir = $(mandir)/man1
+NROFF = nroff
+MANS = $(dist_man1_MANS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -152,18 +159,23 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-ACLOCAL_AMFLAGS = -I ../../m4
-bin_SCRIPTS = \
- context \
- ctxtools \
- luatools \
- mtxrun \
- pstopdf \
- rlxtools \
- texexec \
- texmfstart
-
-EXTRA_DIST = $(bin_SCRIPTS)
+@WIN32_FALSE@dist_bin_SCRIPTS = \
+@WIN32_FALSE@ context \
+@WIN32_FALSE@ ctxtools \
+@WIN32_FALSE@ luatools \
+@WIN32_FALSE@ mtxrun \
+@WIN32_FALSE@ pstopdf \
+@WIN32_FALSE@ rlxtools \
+@WIN32_FALSE@ texexec \
+@WIN32_FALSE@ texmfstart
+
+dist_man1_MANS = \
+ ctxtools.man \
+ mptopdf.man \
+ pstopdf.man \
+ texexec.man \
+ texmfstart.man
+
all: all-am
.SUFFIXES:
@@ -197,10 +209,10 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-install-binSCRIPTS: $(bin_SCRIPTS)
+install-dist_binSCRIPTS: $(dist_bin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
- @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
+ @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
@@ -223,14 +235,48 @@ install-binSCRIPTS: $(bin_SCRIPTS)
} \
; done
-uninstall-binSCRIPTS:
+uninstall-dist_binSCRIPTS:
@$(NORMAL_UNINSTALL)
- @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
+ @list='$(dist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \
files=`for p in $$list; do echo "$$p"; done | \
sed -e 's,.*/,,;$(transform)'`; \
test -n "$$list" || exit 0; \
echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(bindir)" && rm -f $$files
+install-man1: $(dist_man1_MANS)
+ @$(NORMAL_INSTALL)
+ test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
+ @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+ { for i in $$list; do echo "$$i"; done; \
+ } | while read p; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; echo "$$p"; \
+ done | \
+ sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+ sed 'N;N;s,\n, ,g' | { \
+ list=; while read file base inst; do \
+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+ fi; \
+ done; \
+ for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+ while read files; do \
+ test -z "$$files" || { \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+ done; }
+
+uninstall-man1:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
+ files=`{ for i in $$list; do echo "$$i"; done; \
+ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+ test -z "$$files" || { \
+ echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
tags: TAGS
TAGS:
@@ -239,6 +285,19 @@ CTAGS:
distdir: $(DISTFILES)
+ @list='$(MANS)'; if test -n "$$list"; then \
+ list=`for p in $$list; do \
+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+ if test -n "$$list" && \
+ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+ grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \
+ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+ echo " typically \`make maintainer-clean' will remove them" >&2; \
+ exit 1; \
+ else :; fi; \
+ else :; fi
@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
list='$(DISTFILES)'; \
@@ -270,9 +329,9 @@ distdir: $(DISTFILES)
done
check-am: all-am
check: check-am
-all-am: Makefile $(SCRIPTS)
+all-am: Makefile $(SCRIPTS) $(MANS)
installdirs:
- for dir in "$(DESTDIR)$(bindir)"; do \
+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -320,13 +379,13 @@ info: info-am
info-am:
-install-data-am:
+install-data-am: install-man
install-dvi: install-dvi-am
install-dvi-am:
-install-exec-am: install-binSCRIPTS
+install-exec-am: install-dist_binSCRIPTS
install-html: install-html-am
@@ -336,7 +395,7 @@ install-info: install-info-am
install-info-am:
-install-man:
+install-man: install-man1
install-pdf: install-pdf-am
@@ -364,20 +423,23 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-binSCRIPTS
+uninstall-am: uninstall-dist_binSCRIPTS uninstall-man
+
+uninstall-man: uninstall-man1
.MAKE: install-am install-strip
.PHONY: all all-am check check-am clean clean-generic distclean \
distclean-generic distdir dvi dvi-am html html-am info info-am \
- install install-am install-binSCRIPTS install-data \
- install-data-am install-dvi install-dvi-am install-exec \
- install-exec-am install-html install-html-am install-info \
- install-info-am install-man install-pdf install-pdf-am \
- install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
- pdf-am ps ps-am uninstall uninstall-am uninstall-binSCRIPTS
+ install install-am install-data install-data-am \
+ install-dist_binSCRIPTS install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-man install-man1 \
+ install-pdf install-pdf-am install-ps install-ps-am \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am \
+ uninstall-dist_binSCRIPTS uninstall-man uninstall-man1
# Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/Build/source/texk/tetex/context/ctxtools.man b/Build/source/texk/texlive/context/ctxtools.man
index c22263d4267..c22263d4267 100644
--- a/Build/source/texk/tetex/context/ctxtools.man
+++ b/Build/source/texk/texlive/context/ctxtools.man
diff --git a/Build/source/texk/tetex/context/mptopdf.man b/Build/source/texk/texlive/context/mptopdf.man
index 3c547f06aa8..3c547f06aa8 100644
--- a/Build/source/texk/tetex/context/mptopdf.man
+++ b/Build/source/texk/texlive/context/mptopdf.man
diff --git a/Build/source/texk/tetex/context/pstopdf.man b/Build/source/texk/texlive/context/pstopdf.man
index 972f364cb19..972f364cb19 100644
--- a/Build/source/texk/tetex/context/pstopdf.man
+++ b/Build/source/texk/texlive/context/pstopdf.man
diff --git a/Build/source/texk/tetex/context/texexec.man b/Build/source/texk/texlive/context/texexec.man
index 19f56dab96b..19f56dab96b 100644
--- a/Build/source/texk/tetex/context/texexec.man
+++ b/Build/source/texk/texlive/context/texexec.man
diff --git a/Build/source/texk/tetex/context/texmfstart.man b/Build/source/texk/texlive/context/texmfstart.man
index e99ab230bd1..e99ab230bd1 100644
--- a/Build/source/texk/tetex/context/texmfstart.man
+++ b/Build/source/texk/texlive/context/texmfstart.man
diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in
index 47215440536..14a47db7b24 100644
--- a/Build/source/texk/texlive/linked_scripts/Makefile.in
+++ b/Build/source/texk/texlive/linked_scripts/Makefile.in
@@ -37,7 +37,8 @@ DIST_COMMON = $(nobase_dist_script_SCRIPTS) \
$(nobase_dist_scriptx_SCRIPTS) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in ChangeLog
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-win32.m4 \
+ $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(install_sh) -d