Changeset View
Changeset View
Standalone View
Standalone View
x11-toolkits/wxgtk30/files/patch-Makefile.in
--- Makefile.in.orig 2013-11-11 14:10:39.000000000 +0100 | --- Makefile.in.orig 2020-05-02 14:03:18 UTC | ||||
+++ Makefile.in 2014-01-22 10:14:26.000000000 +0100 | +++ Makefile.in | ||||
@@ -25,6 +25,7 @@ | @@ -55,6 +55,7 @@ WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@ | ||||
SONAME_FLAG = @SONAME_FLAG@ | TOOLKIT = @TOOLKIT@ | ||||
STRIP = @STRIP@ | TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ | ||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@ | TOOLKIT_VERSION = @TOOLKIT_VERSION@ | ||||
+INSTALL_SCRIPT = @INSTALL_SCRIPT@ | +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ | ||||
INSTALL_DATA = @INSTALL_DATA@ | TOOLCHAIN_FULLNAME = @TOOLCHAIN_FULLNAME@ | ||||
INSTALL_DIR = @INSTALL_DIR@ | EXTRALIBS = @EXTRALIBS@ | ||||
ICC_PCH_USE_SWITCH = @ICC_PCH_USE_SWITCH@ | EXTRALIBS_XML = @EXTRALIBS_XML@ | ||||
@@ -15214,9 +15215,9 @@ | @@ -15279,9 +15280,9 @@ all: $(__wxregex___depname) $(__wxzlib___depname) $(__ | ||||
install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname) | install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_webkit2_ext___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install | ||||
$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal | $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal | ||||
- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) | - (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal) | ||||
+ (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4) | + (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4) | ||||
$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets | $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets | ||||
- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) | - (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets) | ||||
+ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; done) | + (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; done) | ||||
$(DYLIB_RPATH_INSTALL) | $(DYLIB_RPATH_INSTALL) | ||||
$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx | $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx | ||||
for f in setup.h $(RCDEFS_H); do \ | for f in setup.h $(RCDEFS_H); do \ | ||||
@@ -16099,9 +16100,7 @@ | @@ -16175,9 +16176,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) | ||||
+ $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config | + $(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config | ||||
locale_install: | locale_install: | ||||
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale | $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale | ||||
@@ -16109,7 +16108,7 @@ | @@ -16185,7 +16184,7 @@ locale_install: | ||||
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ | $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \ | ||||
$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ | $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \ | ||||
if test -f $(srcdir)/locale/$$l.mo ; then \ | if test -f $(srcdir)/locale/$$l.mo ; then \ | ||||
- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ | - $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \ | ||||
+ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ | + $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \ | ||||
fi ; \ | fi ; \ | ||||
done | done | ||||