diff options
-rw-r--r-- | Build/source/texk/texlive/linked_scripts/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/texlive/linked_scripts/Makefile.am | 7 | ||||
-rw-r--r-- | Build/source/texk/texlive/linked_scripts/Makefile.in | 6 |
3 files changed, 15 insertions, 4 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/ChangeLog b/Build/source/texk/texlive/linked_scripts/ChangeLog index 9ca402579bc..a62d5920161 100644 --- a/Build/source/texk/texlive/linked_scripts/ChangeLog +++ b/Build/source/texk/texlive/linked_scripts/ChangeLog @@ -1,3 +1,9 @@ +2024-03-19 Karl Berry <karl@tug.org> + + * Makefile.am (install-data-hook, uninstall-hook): can't use + EREs or grep -E or egrep. Switch to successive invocations. + https://tug.org/pipermail/tlbuild/2024q1/005505.html + 2024-03-17 Karl Berry <karl@tug.org> * Makefile.am (install-data-hook, uninstall-hook): diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.am b/Build/source/texk/texlive/linked_scripts/Makefile.am index e6645224af8..6483ac8d5cd 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.am +++ b/Build/source/texk/texlive/linked_scripts/Makefile.am @@ -326,7 +326,9 @@ else !WIN32 cd $(DESTDIR)$(bindir) && \ for s in $(nobase_dist_texmf_scripts_SCRIPTS); do \ target=`basename $$s | tr '[A-Z]' '[a-z]'`; \ - echo "$$s" | grep 'listings-ext.sh\|memoize-.*\.' >/dev/null \ +## we can't use egrep or grep -E or ere patterns portably. + echo "$$s" | grep 'memoize-.*\.' >/dev/null \ + || echo "$$s" | grep 'listings-ext.sh' >/dev/null \ || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \ rm -f $$target; \ echo "creating link '$$target' -> '$$REL/texmf-dist/scripts/$$s'"; \ @@ -362,7 +364,8 @@ endif WIN32 uninstall-hook: @for s in $(nobase_dist_texmf_scripts_SCRIPTS); do \ target=`basename $$s | tr '[A-Z]' '[a-z]'`; \ - echo "$$s" | grep 'listings-ext.sh\|memoize-.*\.' >/dev/null \ + echo "$$s" | grep 'memoize-.*\.' >/dev/null \ + || echo "$$s" | grep 'listings-ext.sh' >/dev/null \ || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \ rm -f $(DESTDIR)$(bindir)/$$target$(WINEXT); \ done diff --git a/Build/source/texk/texlive/linked_scripts/Makefile.in b/Build/source/texk/texlive/linked_scripts/Makefile.in index fe85e5e3e29..b40c07e6229 100644 --- a/Build/source/texk/texlive/linked_scripts/Makefile.in +++ b/Build/source/texk/texlive/linked_scripts/Makefile.in @@ -772,7 +772,8 @@ install-data-hook: installdirs-local @WIN32_FALSE@ cd $(DESTDIR)$(bindir) && \ @WIN32_FALSE@ for s in $(nobase_dist_texmf_scripts_SCRIPTS); do \ @WIN32_FALSE@ target=`basename $$s | tr '[A-Z]' '[a-z]'`; \ -@WIN32_FALSE@ echo "$$s" | grep 'listings-ext.sh\|memoize-.*\.' >/dev/null \ +@WIN32_FALSE@ echo "$$s" | grep 'memoize-.*\.' >/dev/null \ +@WIN32_FALSE@ || echo "$$s" | grep 'listings-ext.sh' >/dev/null \ @WIN32_FALSE@ || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \ @WIN32_FALSE@ rm -f $$target; \ @WIN32_FALSE@ echo "creating link '$$target' -> '$$REL/texmf-dist/scripts/$$s'"; \ @@ -799,7 +800,8 @@ install-links: uninstall-hook: @for s in $(nobase_dist_texmf_scripts_SCRIPTS); do \ target=`basename $$s | tr '[A-Z]' '[a-z]'`; \ - echo "$$s" | grep 'listings-ext.sh\|memoize-.*\.' >/dev/null \ + echo "$$s" | grep 'memoize-.*\.' >/dev/null \ + || echo "$$s" | grep 'listings-ext.sh' >/dev/null \ || target=`echo $$target | sed 's,\.[^/]*$$,,'`; \ rm -f $(DESTDIR)$(bindir)/$$target$(WINEXT); \ done |