Mercurial > mxe-octave

changeset 4698:62d71f1bb5f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dont strip notepad++ files (Bug #53854) * Makefile.in: add GREP var * binary-dist-rules.mk: remove notepad++ files from strip list
author John Donoghue
date Wed, 16 May 2018 10:38:15 -0400
parents 90fa244bd63a
children cc074b479646
files Makefile.in binary-dist-rules.mk
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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