texlive[76190] Build/source/texk/detex: depend on
commits+karl at tug.org
commits+karl at tug.org
Sat Aug 30 23:18:29 CEST 2025
Revision: 76190
https://tug.org/svn/texlive?view=revision&revision=76190
Author: karl
Date: 2025-08-30 23:18:29 +0200 (Sat, 30 Aug 2025)
Log Message:
-----------
depend on detex-src/$(am__dirstamp) to work around detex.l modifications causing build failure
Modified Paths:
--------------
trunk/Build/source/texk/detex/ChangeLog
trunk/Build/source/texk/detex/Makefile.am
trunk/Build/source/texk/detex/Makefile.in
Modified: trunk/Build/source/texk/detex/ChangeLog
===================================================================
--- trunk/Build/source/texk/detex/ChangeLog 2025-08-30 19:47:06 UTC (rev 76189)
+++ trunk/Build/source/texk/detex/ChangeLog 2025-08-30 21:18:29 UTC (rev 76190)
@@ -1,3 +1,13 @@
+2025-08-30 Karl Berry <karl at freefriends.org>
+
+ * Makefile.am (BUILT_SOURCES): depend on detex-src/$(am__dirstamp)
+ to work around modifications to detex.l causing failure
+ due to the detex-src/ subdir in the build directory not being created.
+ Patch from Samuel Thibault.
+ TL report: https://tug.org/pipermail/tlbuild/2025q3/005834.html
+ Debian patch: https://github.com/debian-tex/texlive-bin/blob/master/debian/patches/detex_single_job.diff
+ Debian bug: https://bugs.debian.org/1111524
+
2025-06-08 Karl Berry <karl at freefriends.org>
* detex-src/detex.l: pacify C23.
Modified: trunk/Build/source/texk/detex/Makefile.am
===================================================================
--- trunk/Build/source/texk/detex/Makefile.am 2025-08-30 19:47:06 UTC (rev 76189)
+++ trunk/Build/source/texk/detex/Makefile.am 2025-08-30 21:18:29 UTC (rev 76190)
@@ -1,7 +1,7 @@
## $Id$
## Makefile.am for the TeX Live subdirectory texk/detex/
##
-## Copyright 2017-2022 Karl Berry <tex-live at tug.org>
+## Copyright 2017-2025 Karl Berry <tex-live at tug.org>
## Copyright 2009-2015 Peter Breitenlohner <tex-live at tug.org>
## You may freely use, modify and/or distribute this file.
##
@@ -28,6 +28,14 @@
@DETEX_TREE@/detex.h \
@DETEX_TREE@/detex.l
+# If detex.l is modified, ylwrap will try to create detex.c in
+# builddir/texk/detex/detex-src/, but the detex-src subdir doesn't exist
+# there and neither ylwrap nor Automake creates it (as of 2025-08-30).
+# So ensure that the directory exists before trying to build anything
+# else. TL report, with further links to the Debian bug and patch:
+# https://tug.org/pipermail/tlbuild/2025q3/005834.html
+BUILT_SOURCES = detex-src/$(am__dirstamp)
+
LDADD = $(KPATHSEA_LIBS)
$(detex_OBJECTS): $(KPATHSEA_DEPEND)
Modified: trunk/Build/source/texk/detex/Makefile.in
===================================================================
--- trunk/Build/source/texk/detex/Makefile.in 2025-08-30 19:47:06 UTC (rev 76189)
+++ trunk/Build/source/texk/detex/Makefile.in 2025-08-30 21:18:29 UTC (rev 76190)
@@ -588,6 +588,14 @@
@DETEX_TREE@/detex.h \
@DETEX_TREE@/detex.l
+
+# If detex.l is modified, ylwrap will try to create detex.c in
+# builddir/texk/detex/detex-src/, but the detex-src subdir doesn't exist
+# there and neither ylwrap nor Automake creates it (as of 2025-08-30).
+# So ensure that the directory exists before trying to build anything
+# else. TL report, with further links to the Debian bug and patch:
+# https://tug.org/pipermail/tlbuild/2025q3/005834.html
+BUILT_SOURCES = detex-src/$(am__dirstamp)
LDADD = $(KPATHSEA_LIBS)
man1_MANS = \
$(DETEX_TREE)/detex.man
@@ -595,7 +603,7 @@
dist_check_SCRIPTS = detex.test
TESTS = detex.test
CLEANFILES = test.out texmf.cnf
-all: c-auto.h
+all: $(BUILT_SOURCES) c-auto.h
$(MAKE) $(AM_MAKEFLAGS) all-am
.SUFFIXES:
@@ -1222,14 +1230,17 @@
check-am: all-am
$(MAKE) $(AM_MAKEFLAGS) $(dist_check_SCRIPTS)
$(MAKE) $(AM_MAKEFLAGS) check-TESTS
-check: check-am
+check: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) check-am
all-am: Makefile $(PROGRAMS) $(MANS) c-auto.h
installdirs:
for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
-install: install-am
-install-exec: install-exec-am
+install: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-am
+install-exec: $(BUILT_SOURCES)
+ $(MAKE) $(AM_MAKEFLAGS) install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@@ -1264,6 +1275,7 @@
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
+ -$(am__rm_f) $(BUILT_SOURCES)
-$(am__rm_f) @DETEX_TREE@/detex.c
clean: clean-am
@@ -1340,7 +1352,8 @@
uninstall-man: uninstall-man1
-.MAKE: all check-am install-am install-strip
+.MAKE: all check check-am install install-am install-exec \
+ install-strip
.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles am--refresh check \
check-TESTS check-am clean clean-binPROGRAMS clean-cscope \
More information about the tex-live-commits
mailing list.