# HG changeset patch # User John Donoghue # Date 1526481495 14400 # Node ID 62d71f1bb5f55f982528e57d029505eaefbb50b0 # Parent 90fa244bd63a121b245790a71d4dccea8c7beda1 dont strip notepad++ files (Bug #53854) * Makefile.in: add GREP var * binary-dist-rules.mk: remove notepad++ files from strip list diff -r 90fa244bd63a -r 62d71f1bb5f5 Makefile.in --- a/Makefile.in Tue May 15 08:07:32 2018 -0400 +++ b/Makefile.in Wed May 16 10:38:15 2018 -0400 @@ -206,6 +206,7 @@ SHELL := @SHELL@ +GREP ?= grep INSTALL := $(shell ginstall --help >/dev/null 2>&1 && echo g)install PATCH := $(shell gpatch --help >/dev/null 2>&1 && echo g)patch SED := $(shell gsed --help >/dev/null 2>&1 && echo g)sed diff -r 90fa244bd63a -r 62d71f1bb5f5 binary-dist-rules.mk --- a/binary-dist-rules.mk Tue May 15 08:07:32 2018 -0400 +++ b/binary-dist-rules.mk Wed May 16 10:38:15 2018 -0400 @@ -132,7 +132,7 @@ ifeq ($(MXE_WINDOWS_BUILD),yes) define strip-dist-files echo "stripping files..." - for f in `find $(OCTAVE_DIST_DIR) -name '*.dll' -o -name '*.exe' -o -name '*.oct'`; do \ + for f in `find $(OCTAVE_DIST_DIR) -name '*.dll' -o -name '*.exe' -o -name '*.oct' | $(GREP) -v "notepad++" `; do \ $(MXE_STRIP) $$f; \ done endef