From 99cb097f4d5bb017519f4e3cf233b5439e2526f9 Mon Sep 17 00:00:00 2001 From: wiz Date: Thu, 16 Aug 2018 13:40:28 +0200 Subject: [PATCH] Install wx-config as a script, not as a binary program Installing it using INSTALL_PROGRAM results in problems under NetBSD where INSTALL_PROGRAM tries to strip it. Use INSTALL_SCRIPT instead. Closes #18197. --- Makefile.in | 3 ++- docs/changes.txt | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index f0363aebb4..31ac00fed4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,6 +24,7 @@ PIC_FLAG = @PIC_FLAG@ SONAME_FLAG = @SONAME_FLAG@ STRIP = @STRIP@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_DIR = @INSTALL_DIR@ ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@ @@ -15191,7 +15192,7 @@ samples: install-wxconfig: $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config - $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config + $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config) locale_install: diff --git a/docs/changes.txt b/docs/changes.txt index d48e03e78f..2efcdb59bf 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -96,6 +96,7 @@ All: - Make wxList and wxVector iterators conform to input iterator requirements. - Fix MT-safety problem when reading and writing from wxSocket (jkubalik). - Fix build issues under HaikuOS (mill-j). +- Fix problem with wx-config installation under NetBSD (wiz). All (GUI):