Restore correct wx-config creation and work around MinGW lack of symlinks.
This undoes the changes of r72205 and r72249 (see #14517) as using relative paths for wx-config symlink didn't work correctly if non-default values for $bindir and/or $libdir were used (i.e. if they were not siblings). Instead, fix the original problem of lack of symlinks when using MinGW directly: just use "cp -p" if "ln -s" fails. This should work everywhere and do the right thing. Closes #15463. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74758 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -16098,7 +16098,7 @@ install-wxconfig:
|
||||
$(INSTALL_DIR) $(DESTDIR)$(bindir)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
|
||||
$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
|
||||
(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) ../`basename $(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:
|
||||
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
|
||||
|
@@ -96,7 +96,7 @@
|
||||
$(INSTALL_DIR) $(DESTDIR)$(BINDIR)
|
||||
$(INSTALL_DIR) $(DESTDIR)$(LIBDIR)/wx/config
|
||||
$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(LIBDIR)/wx/config
|
||||
(cd $(DESTDIR)$(BINDIR) && rm -f wx-config && $(LN_S) ../`basename $(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)
|
||||
</command>
|
||||
</action>
|
||||
|
||||
|
Reference in New Issue
Block a user