Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install wx-config as a script, not as a binary program

Browse Source 
Installing it using INSTALL_PROGRAM results in problems under NetBSD
where INSTALL_PROGRAM tries to strip it. Use INSTALL_SCRIPT instead.

Closes #18197.
This commit is contained in:
wiz
2018-08-16 13:40:28 +02:00
committed by Vadim Zeitlin
parent 606dc18e5f
commit 99cb097f4d
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.in
View File

@@ -24,6 +24,7 @@ PIC_FLAG = @PIC_FLAG@
SONAME_FLAG = @SONAME_FLAG@ SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@ STRIP = @STRIP@
INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@ INSTALL_DIR = @INSTALL_DIR@
ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@ ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@
@@ -15191,7 +15192,7 @@ samples:
install-wxconfig: install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(bindir)
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config $(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) (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: locale_install:

1
docs/changes.txt
View File

@@ -96,6 +96,7 @@ All:
- Make wxList and wxVector iterators conform to input iterator requirements. - Make wxList and wxVector iterators conform to input iterator requirements.
- Fix MT-safety problem when reading and writing from wxSocket (jkubalik). - Fix MT-safety problem when reading and writing from wxSocket (jkubalik).
- Fix build issues under HaikuOS (mill-j). - Fix build issues under HaikuOS (mill-j).
- Fix problem with wx-config installation under NetBSD (wiz).
All (GUI): All (GUI):