Merge branch 'master' into dvipdfmx_cmap14

README.md

@@ -6,7 +6,7 @@ This bundle also provides the latest "upstream" sources for the followings:
 
 * ptexenc
 * ptex, (u)pbibtex, (u)pdvitype, (u)ppltotf, (u)ptftopl
-* eptex
+* eptex extention as a part of euptex
 * makejvf
 * mendex
 * dviout-util
@@ -25,9 +25,9 @@ If you have issues, please let us know from the above page.
 ## Contents
 
 The bundle includes sources of:
-ptex, eptex, uptex, euptex,
+ptex, uptex, euptex,
 dvips, dvipdfmx, dvi2tty, makejvf, mendex, upmendex,
-pbibtex, upbibtex, pmpost, upmpost,
+upbibtex, pmpost, upmpost,
 dviout-util (dvispc, chkdvifont),
 seetex (dvibook, dviconcat, dviselect, dvitodvi),
 dvidvi, bibtex-x, related tools

source/ChangeLog

@@ -1,3 +1,9 @@
+2024-04-29  Karl Berry  <[email protected]>
+
+	* Makefile.am (distdir): override default dist generation,
+	since we don't try to keep make dist working any more.
+	https://tug.org/pipermail/tlbuild/2024q2/005547.html
+
 2023-12-31  Karl Berry  <[email protected]>
 
 	* reautoconf: add -f / --force option to pass to autoreconf.

source/Makefile.am

@@ -103,3 +103,16 @@ texlinks:
 .PHONY: triptrap
 triptrap:
 	cd texk && $(MAKE) $(AM_MAKEFLAGS) $@
+
+# We aren't trying to keep make dist working. Sorry.
+distdir:
+	@echo "Sorry, we don't try to keep make dist working in TeX Live."
+	@echo
+	@echo "You can retrieve the development and/or released sources"
+	@echo "  in various ways: https://tug.org/texlive/svn"
+	@echo
+	@echo "For info on how to integrate the built binaries into a runnable"
+	@echo "  system, see: https://tug.org/texlive/build.html#deploy"
+	@echo
+	@echo "The result of make install is not usable by itself."
+	@false

source/Makefile.in

@@ -669,8 +669,6 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
-distdir: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) distdir-am
 
 distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
@@ -1084,6 +1082,19 @@ texlinks:
 triptrap:
 	cd texk && $(MAKE) $(AM_MAKEFLAGS) $@
 
+# We aren't trying to keep make dist working. Sorry.
+distdir:
+	@echo "Sorry, we don't try to keep make dist working in TeX Live."
+	@echo
+	@echo "You can retrieve the development and/or released sources"
+	@echo "  in various ways: https://tug.org/texlive/svn"
+	@echo
+	@echo "For info on how to integrate the built binaries into a runnable"
+	@echo "  system, see: https://tug.org/texlive/build.html#deploy"
+	@echo
+	@echo "The result of make install is not usable by itself."
+	@false
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: