37 files changed, 129 insertions, 110 deletions

diff --git a/Build/source/Makefile.in b/Build/source/Makefile.in
index 0770d30c049..3071a286758 100644
--- a/Build/source/Makefile.in
+++ b/Build/source/Makefile.in
@@ -123,6 +123,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/tardate.ac \
 	$(top_srcdir)/version.ac \
+	$(top_srcdir)/utils/devnag/ac/withenable.ac \
 	$(top_srcdir)/utils/m-tx/ac/withenable.ac \
 	$(top_srcdir)/utils/pmx/ac/withenable.ac \
 	$(top_srcdir)/utils/ps2eps/ac/withenable.ac \
@@ -142,7 +143,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/texk/chktex/ac/withenable.ac \
 	$(top_srcdir)/texk/cjkutils/ac/withenable.ac \
 	$(top_srcdir)/texk/detex/ac/withenable.ac \
-	$(top_srcdir)/texk/devnag/ac/withenable.ac \
 	$(top_srcdir)/texk/dtl/ac/withenable.ac \
 	$(top_srcdir)/texk/dvi2tty/ac/withenable.ac \
 	$(top_srcdir)/texk/dvidvi/ac/withenable.ac \
diff --git a/Build/source/configure b/Build/source/configure
index 9ee2ceecb9c..8ceeab4c4d7 100755
--- a/Build/source/configure
+++ b/Build/source/configure
@@ -784,6 +784,7 @@ enable_native_texlive_build
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_devnag
 enable_m_tx
 enable_pmx
 enable_ps2eps
@@ -845,7 +846,6 @@ enable_bibtexu
 enable_chktex
 enable_cjkutils
 enable_detex
-enable_devnag
 enable_dtl
 enable_dvi2tty
 enable_dvidvi
@@ -1599,6 +1599,7 @@ Optional Features:
                           lib/PLATFORM
   --enable-cxx-runtime-hack  link C++ runtime statically
   --enable-libtool-hack   ignore libtool dependency_libs
+  --disable-devnag        do not build the devnag package
   --disable-m-tx          do not build the m-tx package
   --disable-pmx           do not build the pmx package
   --disable-ps2eps        do not build the ps2eps package
@@ -1658,7 +1659,6 @@ Optional Features:
   --disable-chktex        do not build the chktex package
   --disable-cjkutils      do not build the cjkutils package
   --disable-detex         do not build the detex package
-  --disable-devnag        do not build the devnag package
   --disable-dtl           do not build the dtl package
   --disable-dvi2tty       do not build the dvi2tty package
   --disable-dvidvi        do not build the dvidvi package
@@ -4133,6 +4133,24 @@ $as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
      ;;
 esac ;;
 esac
+## utils/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/devnag/
+## configure options and TL libraries required for devnag
+# Check whether --enable-devnag was given.
+if test "${enable_devnag+set}" = set; then :
+  enableval=$enable_devnag;
+fi
+case $enable_devnag in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_devnag=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
+$as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'"
+    ;;
+esac
+
 ## utils/m-tx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/m-tx/
 ## configure options and TL libraries required for mtx
 # Check whether --enable-m-tx was given.
@@ -4853,24 +4871,6 @@ test "x$enable_detex" = xno || {
   need_kpathsea=yes
 }
 
-## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/
-## configure options and TL libraries required for devnag
-# Check whether --enable-devnag was given.
-if test "${enable_devnag+set}" = set; then :
-  enableval=$enable_devnag;
-fi
-case $enable_devnag in #(
-  yes|no) :
-     ;; #(
-  *) :
-
-   enable_devnag=$enable_all_pkgs
-     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
-$as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'"
-    ;;
-esac
-
 ## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/
 ## configure options and TL libraries required for dtl
 # Check whether --enable-dtl was given.
diff --git a/Build/source/doc/Makefile.in b/Build/source/doc/Makefile.in
index bba4699e0f4..e728e090f94 100644
--- a/Build/source/doc/Makefile.in
+++ b/Build/source/doc/Makefile.in
@@ -114,6 +114,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
 	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/tardate.ac \
 	$(top_srcdir)/version.ac \
+	$(top_srcdir)/utils/devnag/ac/withenable.ac \
 	$(top_srcdir)/utils/m-tx/ac/withenable.ac \
 	$(top_srcdir)/utils/pmx/ac/withenable.ac \
 	$(top_srcdir)/utils/ps2eps/ac/withenable.ac \
@@ -133,7 +134,6 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/texk/chktex/ac/withenable.ac \
 	$(top_srcdir)/texk/cjkutils/ac/withenable.ac \
 	$(top_srcdir)/texk/detex/ac/withenable.ac \
-	$(top_srcdir)/texk/devnag/ac/withenable.ac \
 	$(top_srcdir)/texk/dtl/ac/withenable.ac \
 	$(top_srcdir)/texk/dvi2tty/ac/withenable.ac \
 	$(top_srcdir)/texk/dvidvi/ac/withenable.ac \
diff --git a/Build/source/libs/Makefile.in b/Build/source/libs/Makefile.in
index e833b78eca8..79aae9197a2 100644
--- a/Build/source/libs/Makefile.in
+++ b/Build/source/libs/Makefile.in
@@ -121,6 +121,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zlib-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zziplib-flags.m4 \
 	$(top_srcdir)/../version.ac \
+	$(top_srcdir)/../utils/devnag/ac/withenable.ac \
 	$(top_srcdir)/../utils/m-tx/ac/withenable.ac \
 	$(top_srcdir)/../utils/pmx/ac/withenable.ac \
 	$(top_srcdir)/../utils/ps2eps/ac/withenable.ac \
@@ -140,7 +141,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/../texk/chktex/ac/withenable.ac \
 	$(top_srcdir)/../texk/cjkutils/ac/withenable.ac \
 	$(top_srcdir)/../texk/detex/ac/withenable.ac \
-	$(top_srcdir)/../texk/devnag/ac/withenable.ac \
 	$(top_srcdir)/../texk/dtl/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvi2tty/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvidvi/ac/withenable.ac \
diff --git a/Build/source/libs/configure b/Build/source/libs/configure
index 6fb8c1dbfa7..7c810c464d7 100755
--- a/Build/source/libs/configure
+++ b/Build/source/libs/configure
@@ -696,6 +696,7 @@ enable_native_texlive_build
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_devnag
 enable_m_tx
 enable_pmx
 enable_ps2eps
@@ -757,7 +758,6 @@ enable_bibtexu
 enable_chktex
 enable_cjkutils
 enable_detex
-enable_devnag
 enable_dtl
 enable_dvi2tty
 enable_dvidvi
@@ -1506,6 +1506,7 @@ Optional Features:
                           lib/PLATFORM
   --enable-cxx-runtime-hack  link C++ runtime statically
   --enable-libtool-hack   ignore libtool dependency_libs
+  --disable-devnag        do not build the devnag package
   --disable-m-tx          do not build the m-tx package
   --disable-pmx           do not build the pmx package
   --disable-ps2eps        do not build the ps2eps package
@@ -1565,7 +1566,6 @@ Optional Features:
   --disable-chktex        do not build the chktex package
   --disable-cjkutils      do not build the cjkutils package
   --disable-detex         do not build the detex package
-  --disable-devnag        do not build the devnag package
   --disable-dtl           do not build the dtl package
   --disable-dvi2tty       do not build the dvi2tty package
   --disable-dvidvi        do not build the dvidvi package
@@ -3381,6 +3381,24 @@ $as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
      ;;
 esac ;;
 esac
+## utils/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/devnag/
+## configure options and TL libraries required for devnag
+# Check whether --enable-devnag was given.
+if test "${enable_devnag+set}" = set; then :
+  enableval=$enable_devnag;
+fi
+case $enable_devnag in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_devnag=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
+$as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'"
+    ;;
+esac
+
 ## utils/m-tx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/m-tx/
 ## configure options and TL libraries required for mtx
 # Check whether --enable-m-tx was given.
@@ -4101,24 +4119,6 @@ test "x$enable_detex" = xno || {
   need_kpathsea=yes
 }
 
-## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/
-## configure options and TL libraries required for devnag
-# Check whether --enable-devnag was given.
-if test "${enable_devnag+set}" = set; then :
-  enableval=$enable_devnag;
-fi
-case $enable_devnag in #(
-  yes|no) :
-     ;; #(
-  *) :
-
-   enable_devnag=$enable_all_pkgs
-     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
-$as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'"
-    ;;
-esac
-
 ## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/
 ## configure options and TL libraries required for dtl
 # Check whether --enable-dtl was given.
diff --git a/Build/source/m4/ChangeLog b/Build/source/m4/ChangeLog
index dccc3008adc..b3399af03c3 100644
--- a/Build/source/m4/ChangeLog
+++ b/Build/source/m4/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* kpse-pkgs.m4 (kpse_texk_pkgs): Move devnag from here ...
+	(kpse_utils_pkgs): ... to here.
+
 2014-12-06  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* kpse-pkgs.m4 (kpse_texk_pkgs): Rename ps2pkm => ps2pk.
diff --git a/Build/source/m4/kpse-pkgs.m4 b/Build/source/m4/kpse-pkgs.m4
index cd6377e53ea..7025d913ede 100644
--- a/Build/source/m4/kpse-pkgs.m4
+++ b/Build/source/m4/kpse-pkgs.m4
@@ -80,6 +80,7 @@ AC_REQUIRE([KPSE_HARFBUZZ_SYSTEM_FLAGS])[]dnl
 # Define the list of utility sub-packages, i.e., subdirs 'utils/*'.
 AC_DEFUN([KPSE_UTILS_PKGS], [dnl
 m4_define([kpse_utils_pkgs], [dnl
+devnag
 m-tx
 pmx
 ps2eps
@@ -103,7 +104,6 @@ bibtex-x
 chktex
 cjkutils
 detex
-devnag
 dtl
 dvi2tty
 dvidvi
diff --git a/Build/source/texk/Makefile.in b/Build/source/texk/Makefile.in
index fedd45b626d..e3ae7142b8a 100644
--- a/Build/source/texk/Makefile.in
+++ b/Build/source/texk/Makefile.in
@@ -121,6 +121,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zlib-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zziplib-flags.m4 \
 	$(top_srcdir)/../version.ac \
+	$(top_srcdir)/../utils/devnag/ac/withenable.ac \
 	$(top_srcdir)/../utils/m-tx/ac/withenable.ac \
 	$(top_srcdir)/../utils/pmx/ac/withenable.ac \
 	$(top_srcdir)/../utils/ps2eps/ac/withenable.ac \
@@ -140,7 +141,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/../texk/chktex/ac/withenable.ac \
 	$(top_srcdir)/../texk/cjkutils/ac/withenable.ac \
 	$(top_srcdir)/../texk/detex/ac/withenable.ac \
-	$(top_srcdir)/../texk/devnag/ac/withenable.ac \
 	$(top_srcdir)/../texk/dtl/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvi2tty/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvidvi/ac/withenable.ac \
diff --git a/Build/source/texk/README b/Build/source/texk/README
index e8c5d418f11..f09afb2f0e0 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -37,8 +37,6 @@ cjkutils 4.8.3 - checked 11may12
 detex 2.8 - checked 10may12
   http://www.cs.purdue.edu/homes/trinkle/detex/
 
-devnag - from devnag package installed in texmf-dist.
-
 dtl - ?
 
 dvi2tty 5.3.4 - checked 10may12
diff --git a/Build/source/texk/configure b/Build/source/texk/configure
index 268ddf0f033..5afa49d931f 100755
--- a/Build/source/texk/configure
+++ b/Build/source/texk/configure
@@ -696,6 +696,7 @@ enable_native_texlive_build
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_devnag
 enable_m_tx
 enable_pmx
 enable_ps2eps
@@ -757,7 +758,6 @@ enable_bibtexu
 enable_chktex
 enable_cjkutils
 enable_detex
-enable_devnag
 enable_dtl
 enable_dvi2tty
 enable_dvidvi
@@ -867,7 +867,6 @@ bibtex-x
 chktex
 cjkutils
 detex
-devnag
 dtl
 dvi2tty
 dvidvi
@@ -1517,6 +1516,7 @@ Optional Features:
                           lib/PLATFORM
   --enable-cxx-runtime-hack  link C++ runtime statically
   --enable-libtool-hack   ignore libtool dependency_libs
+  --disable-devnag        do not build the devnag package
   --disable-m-tx          do not build the m-tx package
   --disable-pmx           do not build the pmx package
   --disable-ps2eps        do not build the ps2eps package
@@ -1576,7 +1576,6 @@ Optional Features:
   --disable-chktex        do not build the chktex package
   --disable-cjkutils      do not build the cjkutils package
   --disable-detex         do not build the detex package
-  --disable-devnag        do not build the devnag package
   --disable-dtl           do not build the dtl package
   --disable-dvi2tty       do not build the dvi2tty package
   --disable-dvidvi        do not build the dvidvi package
@@ -3392,6 +3391,24 @@ $as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
      ;;
 esac ;;
 esac
+## utils/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/devnag/
+## configure options and TL libraries required for devnag
+# Check whether --enable-devnag was given.
+if test "${enable_devnag+set}" = set; then :
+  enableval=$enable_devnag;
+fi
+case $enable_devnag in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_devnag=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
+$as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'"
+    ;;
+esac
+
 ## utils/m-tx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/m-tx/
 ## configure options and TL libraries required for mtx
 # Check whether --enable-m-tx was given.
@@ -4112,24 +4129,6 @@ test "x$enable_detex" = xno || {
   need_kpathsea=yes
 }
 
-## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/
-## configure options and TL libraries required for devnag
-# Check whether --enable-devnag was given.
-if test "${enable_devnag+set}" = set; then :
-  enableval=$enable_devnag;
-fi
-case $enable_devnag in #(
-  yes|no) :
-     ;; #(
-  *) :
-
-   enable_devnag=$enable_all_pkgs
-     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
-$as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'"
-    ;;
-esac
-
 ## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/
 ## configure options and TL libraries required for dtl
 # Check whether --enable-dtl was given.
@@ -6422,14 +6421,6 @@ if test -x $srcdir/detex/configure; then
 
   fi
 fi
-if test -x $srcdir/devnag/configure; then
-  test "x$enable_devnag" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS devnag"
-  CONF_SUBDIRS="$CONF_SUBDIRS devnag"
-  if false; then
-    subdirs="$subdirs devnag"
-
-  fi
-fi
 if test -x $srcdir/dtl/configure; then
   test "x$enable_dtl" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS dtl"
   CONF_SUBDIRS="$CONF_SUBDIRS dtl"
diff --git a/Build/source/texk/devnag/ac/withenable.ac b/Build/source/texk/devnag/ac/withenable.ac
deleted file mode 100644
index 862a4ae7e2e..00000000000
--- a/Build/source/texk/devnag/ac/withenable.ac
+++ /dev/null
@@ -1,7 +0,0 @@
-## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/
-dnl
-dnl Copyright (C) 2009 Peter Breitenlohner <tex-live@tug.org>
-dnl You may freely use, modify and/or distribute this file.
-dnl
-## configure options and TL libraries required for devnag
-KPSE_ENABLE_PROG([devnag])
diff --git a/Build/source/utils/Makefile.in b/Build/source/utils/Makefile.in
index 190b538dad7..17e82c6f1bc 100644
--- a/Build/source/utils/Makefile.in
+++ b/Build/source/utils/Makefile.in
@@ -121,6 +121,7 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zlib-flags.m4 \
 	$(top_srcdir)/../m4/kpse-zziplib-flags.m4 \
 	$(top_srcdir)/../version.ac \
+	$(top_srcdir)/../utils/devnag/ac/withenable.ac \
 	$(top_srcdir)/../utils/m-tx/ac/withenable.ac \
 	$(top_srcdir)/../utils/pmx/ac/withenable.ac \
 	$(top_srcdir)/../utils/ps2eps/ac/withenable.ac \
@@ -140,7 +141,6 @@ am__aclocal_m4_deps = $(top_srcdir)/../m4/kpse-cairo-flags.m4 \
 	$(top_srcdir)/../texk/chktex/ac/withenable.ac \
 	$(top_srcdir)/../texk/cjkutils/ac/withenable.ac \
 	$(top_srcdir)/../texk/detex/ac/withenable.ac \
-	$(top_srcdir)/../texk/devnag/ac/withenable.ac \
 	$(top_srcdir)/../texk/dtl/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvi2tty/ac/withenable.ac \
 	$(top_srcdir)/../texk/dvidvi/ac/withenable.ac \
diff --git a/Build/source/utils/README b/Build/source/utils/README
index 79ee6ed6f4d..97e54519ef7 100644
--- a/Build/source/utils/README
+++ b/Build/source/utils/README
@@ -9,6 +9,8 @@ asymptote 2.31 - checked 17may14
   see http://tug.org/texlive/build.html#asymptote
   and tlpkg/bin/tl-update-asy
 
+devnag - from devanagari package installed in texmf-dist.
+
 m-tx 0.60d - checked 16apr12
   http://mirror.ctan.org/support/m-tx/
 
diff --git a/Build/source/utils/configure b/Build/source/utils/configure
index ff8f21eeb3c..b0d12631b38 100755
--- a/Build/source/utils/configure
+++ b/Build/source/utils/configure
@@ -696,6 +696,7 @@ enable_native_texlive_build
 enable_multiplatform
 enable_cxx_runtime_hack
 enable_libtool_hack
+enable_devnag
 enable_m_tx
 enable_pmx
 enable_ps2eps
@@ -757,7 +758,6 @@ enable_bibtexu
 enable_chktex
 enable_cjkutils
 enable_detex
-enable_devnag
 enable_dtl
 enable_dvi2tty
 enable_dvidvi
@@ -861,7 +861,8 @@ CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS'
-ac_subdirs_all='m-tx
+ac_subdirs_all='devnag
+m-tx
 pmx
 ps2eps
 t1utils
@@ -1496,6 +1497,7 @@ Optional Features:
                           lib/PLATFORM
   --enable-cxx-runtime-hack  link C++ runtime statically
   --enable-libtool-hack   ignore libtool dependency_libs
+  --disable-devnag        do not build the devnag package
   --disable-m-tx          do not build the m-tx package
   --disable-pmx           do not build the pmx package
   --disable-ps2eps        do not build the ps2eps package
@@ -1555,7 +1557,6 @@ Optional Features:
   --disable-chktex        do not build the chktex package
   --disable-cjkutils      do not build the cjkutils package
   --disable-detex         do not build the detex package
-  --disable-devnag        do not build the devnag package
   --disable-dtl           do not build the dtl package
   --disable-dvi2tty       do not build the dvi2tty package
   --disable-dvidvi        do not build the dvidvi package
@@ -3371,6 +3372,24 @@ $as_echo "$as_me: $host -> \`--disable-luajittex'" >&6;}
      ;;
 esac ;;
 esac
+## utils/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/devnag/
+## configure options and TL libraries required for devnag
+# Check whether --enable-devnag was given.
+if test "${enable_devnag+set}" = set; then :
+  enableval=$enable_devnag;
+fi
+case $enable_devnag in #(
+  yes|no) :
+     ;; #(
+  *) :
+
+   enable_devnag=$enable_all_pkgs
+     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
+$as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
+     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'"
+    ;;
+esac
+
 ## utils/m-tx/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/m-tx/
 ## configure options and TL libraries required for mtx
 # Check whether --enable-m-tx was given.
@@ -4091,24 +4110,6 @@ test "x$enable_detex" = xno || {
   need_kpathsea=yes
 }
 
-## texk/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/devnag/
-## configure options and TL libraries required for devnag
-# Check whether --enable-devnag was given.
-if test "${enable_devnag+set}" = set; then :
-  enableval=$enable_devnag;
-fi
-case $enable_devnag in #(
-  yes|no) :
-     ;; #(
-  *) :
-
-   enable_devnag=$enable_all_pkgs
-     { $as_echo "$as_me:${as_lineno-$LINENO}: Assuming \`--enable-devnag=$enable_devnag'" >&5
-$as_echo "$as_me: Assuming \`--enable-devnag=$enable_devnag'" >&6;}
-     ac_configure_args="$ac_configure_args '--enable-devnag=$enable_devnag'"
-    ;;
-esac
-
 ## texk/dtl/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory texk/dtl/
 ## configure options and TL libraries required for dtl
 # Check whether --enable-dtl was given.
@@ -6353,6 +6354,14 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 $as_echo_n "checking for Utils programs to build... " >&6; }
 MAKE_SUBDIRS=
 CONF_SUBDIRS=
+if test -x $srcdir/devnag/configure; then
+  test "x$enable_devnag" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS devnag"
+  CONF_SUBDIRS="$CONF_SUBDIRS devnag"
+  if false; then
+    subdirs="$subdirs devnag"
+
+  fi
+fi
 if test -x $srcdir/m-tx/configure; then
   test "x$enable_m_tx" = xyes && MAKE_SUBDIRS="$MAKE_SUBDIRS m-tx"
   CONF_SUBDIRS="$CONF_SUBDIRS m-tx"
diff --git a/Build/source/texk/devnag/AUTHORS b/Build/source/utils/devnag/AUTHORS
index d4288770dbd..d4288770dbd 100644
--- a/Build/source/texk/devnag/AUTHORS
+++ b/Build/source/utils/devnag/AUTHORS
diff --git a/Build/source/texk/devnag/COPYING b/Build/source/utils/devnag/COPYING
index d60c31a97a5..d60c31a97a5 100644
--- a/Build/source/texk/devnag/COPYING
+++ b/Build/source/utils/devnag/COPYING
diff --git a/Build/source/texk/devnag/ChangeLog b/Build/source/utils/devnag/ChangeLog
index 16f605965d9..fb14fa701b0 100644
--- a/Build/source/texk/devnag/ChangeLog
+++ b/Build/source/utils/devnag/ChangeLog
@@ -1,3 +1,9 @@
+2014-12-23  Peter Breitenlohner  <peb@mppmu.mpg.de>
+
+	* Makefile.am (AM_CPPFLAGS): Define TEXLIVE.
+	* src/devnag.c: Use binary mode for output files only when
+	compiling for TeX Live.
+
 2014-06-19  Peter Breitenlohner  <peb@mppmu.mpg.de>
 
 	* src/devnag.c: Avoid undefined behaviour when char is signed.
diff --git a/Build/source/texk/devnag/INSTALL b/Build/source/utils/devnag/INSTALL
index a4b34144dcf..a4b34144dcf 100644
--- a/Build/source/texk/devnag/INSTALL
+++ b/Build/source/utils/devnag/INSTALL
diff --git a/Build/source/texk/devnag/Makefile.am b/Build/source/utils/devnag/Makefile.am
index e8ba13e6bc0..9a17e26a6f6 100644
--- a/Build/source/texk/devnag/Makefile.am
+++ b/Build/source/utils/devnag/Makefile.am
@@ -1,8 +1,10 @@
-## Makefile.am for the TeX Live subdirectory texk/devnag/
+## Makefile.am for the TeX Live subdirectory utils/devnag/
 ##
 ## Copyright 2009-2014 Peter Breitenlohner <tex-live@tug.org>
 ## You may freely use, modify and/or distribute this file.
 ##
+AM_CPPFLAGS = -DTEXLIVE
+
 AM_CFLAGS = $(WARNING_CFLAGS)
 
 bin_PROGRAMS = devnag
diff --git a/Build/source/texk/devnag/Makefile.in b/Build/source/utils/devnag/Makefile.in
index 2790c916bdf..e35b2da394a 100644
--- a/Build/source/texk/devnag/Makefile.in
+++ b/Build/source/utils/devnag/Makefile.in
@@ -469,6 +469,7 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
+AM_CPPFLAGS = -DTEXLIVE
 AM_CFLAGS = $(WARNING_CFLAGS)
 devnag_SOURCES = src/devnag.c
 DISTCLEANFILES = config.force captions.dn examples.dn *.tex
diff --git a/Build/source/texk/devnag/NEWS b/Build/source/utils/devnag/NEWS
index e69de29bb2d..e69de29bb2d 100644
--- a/Build/source/texk/devnag/NEWS
+++ b/Build/source/utils/devnag/NEWS
diff --git a/Build/source/texk/devnag/README b/Build/source/utils/devnag/README
index 1aa09773cf8..1aa09773cf8 100644
--- a/Build/source/texk/devnag/README
+++ b/Build/source/utils/devnag/README
diff --git a/Build/source/utils/devnag/ac/withenable.ac b/Build/source/utils/devnag/ac/withenable.ac
new file mode 100644
index 00000000000..b05d66496b9
--- /dev/null
+++ b/Build/source/utils/devnag/ac/withenable.ac
@@ -0,0 +1,7 @@
+## utils/devnag/ac/withenable.ac: configure.ac fragment for the TeX Live subdirectory utils/devnag/
+dnl
+dnl Copyright (C) 2009-2014 Peter Breitenlohner <tex-live@tug.org>
+dnl You may freely use, modify and/or distribute this file.
+dnl
+## configure options and TL libraries required for devnag
+KPSE_ENABLE_PROG([devnag])
diff --git a/Build/source/texk/devnag/aclocal.m4 b/Build/source/utils/devnag/aclocal.m4
index 7788d8b5d0a..7788d8b5d0a 100644
--- a/Build/source/texk/devnag/aclocal.m4
+++ b/Build/source/utils/devnag/aclocal.m4
diff --git a/Build/source/texk/devnag/config.h.in b/Build/source/utils/devnag/config.h.in
index dd3b02c5fcf..dd3b02c5fcf 100644
--- a/Build/source/texk/devnag/config.h.in
+++ b/Build/source/utils/devnag/config.h.in
diff --git a/Build/source/texk/devnag/configure b/Build/source/utils/devnag/configure
index cc6ff510aaf..ee6e380393b 100755
--- a/Build/source/texk/devnag/configure
+++ b/Build/source/utils/devnag/configure
@@ -3687,7 +3687,6 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags
 
 ac_config_headers="$ac_config_headers config.h"
 
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
diff --git a/Build/source/texk/devnag/configure.ac b/Build/source/utils/devnag/configure.ac
index 1d891c13478..a369889c350 100644
--- a/Build/source/texk/devnag/configure.ac
+++ b/Build/source/utils/devnag/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
-dnl   Copyright (C) 2009-2013 Peter Breitenlohner <tex-live@tug.org>
+dnl   Copyright (C) 2009-2014 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,
@@ -14,7 +14,7 @@ AC_CONFIG_MACRO_DIR([../../m4])
 
 KPSE_BASIC([devnag])
 
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([config.h])[]dnl unused, to avoid zillions of -D's on command line
 
 dnl Checks for programs.
 AC_PROG_CC
diff --git a/Build/source/texk/devnag/src/devnag.c b/Build/source/utils/devnag/src/devnag.c
index af163c83ff3..421a3f99ade 100644
--- a/Build/source/texk/devnag/src/devnag.c
+++ b/Build/source/utils/devnag/src/devnag.c
@@ -1334,7 +1334,13 @@ int main(int argc, char **argv) {
       }
       if (strcasecmp(infil, outfil) == 0) strcat(outfil, DEFAULT_DEST_EXT);
    }
-   if ((f_out = fopen(outfil, "wb")) == NULL) {
+#ifdef TEXLIVE
+/* In TeX Live we want to share files between Unix and Windows systems.  */
+#define FOPEN_W_MODE "wb"
+#else
+#define FOPEN_W_MODE "w"
+#endif
+   if ((f_out = fopen(outfil, FOPEN_W_MODE)) == NULL) {
       fclose(f_in);
       fprintf(stderr, "cannot open %s for output\n", outfil);
       exit(1);
diff --git a/Build/source/texk/devnag/tests/captions.dn b/Build/source/utils/devnag/tests/captions.dn
index 689ca67448f..689ca67448f 100644
--- a/Build/source/texk/devnag/tests/captions.dn
+++ b/Build/source/utils/devnag/tests/captions.dn
diff --git a/Build/source/texk/devnag/tests/captions.tex b/Build/source/utils/devnag/tests/captions.tex
index 14bd7a4fbae..14bd7a4fbae 100644
--- a/Build/source/texk/devnag/tests/captions.tex
+++ b/Build/source/utils/devnag/tests/captions.tex
diff --git a/Build/source/texk/devnag/tests/devnag.test b/Build/source/utils/devnag/tests/devnag.test
index a528be0c199..a528be0c199 100755
--- a/Build/source/texk/devnag/tests/devnag.test
+++ b/Build/source/utils/devnag/tests/devnag.test
diff --git a/Build/source/texk/devnag/tests/examples.dn b/Build/source/utils/devnag/tests/examples.dn
index 301c70c550c..301c70c550c 100644
--- a/Build/source/texk/devnag/tests/examples.dn
+++ b/Build/source/utils/devnag/tests/examples.dn
diff --git a/Build/source/texk/devnag/tests/examples.tex b/Build/source/utils/devnag/tests/examples.tex
index 13008240ee5..13008240ee5 100644
--- a/Build/source/texk/devnag/tests/examples.tex
+++ b/Build/source/utils/devnag/tests/examples.tex
diff --git a/Build/source/texk/devnag/tests/misspaal.dn b/Build/source/utils/devnag/tests/misspaal.dn
index e327784ebfa..e327784ebfa 100644
--- a/Build/source/texk/devnag/tests/misspaal.dn
+++ b/Build/source/utils/devnag/tests/misspaal.dn
diff --git a/Build/source/texk/devnag/tests/misspaal.tex b/Build/source/utils/devnag/tests/misspaal.tex
index 007ec8fdbf7..007ec8fdbf7 100644
--- a/Build/source/texk/devnag/tests/misspaal.tex
+++ b/Build/source/utils/devnag/tests/misspaal.tex
diff --git a/Build/source/texk/devnag/tests/vedasample.dn b/Build/source/utils/devnag/tests/vedasample.dn
index c2a10256e94..c2a10256e94 100644
--- a/Build/source/texk/devnag/tests/vedasample.dn
+++ b/Build/source/utils/devnag/tests/vedasample.dn
diff --git a/Build/source/texk/devnag/tests/vedasample.tex b/Build/source/utils/devnag/tests/vedasample.tex
index 924a6671f31..924a6671f31 100644
--- a/Build/source/texk/devnag/tests/vedasample.tex
+++ b/Build/source/utils/devnag/tests/vedasample.tex