From f83085cff839711e92b0dfdad5ba98a94cea5c16 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 2 May 2020 15:55:25 +0200 Subject: [PATCH] Add back the use of INSTALL_SCRIPT correctly Due to a momentary lapse of reason, the changes of 99cb097f4d (Install wx-config as a script, not as a binary program, 2018-08-16) were applied to the generated Makefile.in file and so were promptly lost during the next rebake. Reapply them properly now, by modifying the .bkl file from which this file is generated. Note that rebaking now requires bakefile v0.2.12, which adds support for defining INSTALL_SCRIPT. See #18197. --- Makefile.in | 3 ++- build/bakefiles/wx.bkl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index a46e3281ee..732d1acff8 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@ @@ -14707,7 +14708,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/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl index fe5f922871..806b11a538 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -95,7 +95,7 @@ $(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)