Attachment #122378 for bug #178824




SONAME_FLAG = @SONAME_FLAG@
STRIP = @STRIP@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_DIR = @INSTALL_DIR@
srcdir = @srcdir@


install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___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_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___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_DIR) $(DESTDIR)$(datadir)/aclocal
	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; done)
	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx
	(cd ./ ; $(INSTALL_DATA)  lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx)
	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f`; \
	fi; \
	$(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx//$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
	done
	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
	for f in $(ALL_HEADERS); do \
	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \


install-wxconfig: 
	$(INSTALL_DIR) $(DESTDIR)$(bindir)
	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)

locale_install: 
	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale

	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
	if test -f $(srcdir)/locale/$$l.mo ; then \
	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
	fi ; \
	done


Lines 1452-1457 Link Here

(-)wxPython-src-2.6.3.3-orig/src/common/intl.cpp (-1 / +3 lines)
1452	m_initialized = false;	1452	m_initialized = false;
1453	}	1453	}
1454		1454
		1455	#define wxSTRINGIZE2(x) wxSTRINGIZE(x)
		1456
1455	// NB: this function has (desired) side effect of changing current locale	1457	// NB: this function has (desired) side effect of changing current locale
1456	bool wxLocale::Init(const wxChar *szName,	1458	bool wxLocale::Init(const wxChar *szName,
1457	const wxChar *szShort,	1459	const wxChar *szShort,
Lines 1520-1526 Link Here
1520	bool bOk = true;	1522	bool bOk = true;
1521	if ( bLoadDefault )	1523	if ( bLoadDefault )
1522	{	1524	{
1523	bOk = AddCatalog(wxT("wxstd"));	1525	bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));
1524		1526
1525	// there may be a catalog with toolkit specific overrides, it is not	1527	// there may be a catalog with toolkit specific overrides, it is not
1526	// an error if this does not exist	1528	// an error if this does not exist




TOOLKIT = @TOOLKIT@
TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
TOOLKIT_VERSION = @TOOLKIT_VERSION@
TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
EXTRALIBS = @EXTRALIBS@
EXTRALIBS_XML = @EXTRALIBS_XML@
EXTRALIBS_GUI = @EXTRALIBS_GUI@


@COND_USE_XRC_1@install_wxrc: 
@COND_USE_XRC_1@	$(INSTALL_DIR) $(DESTDIR)$(bindir)
@COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(TOOLCHAIN_NAME)
@COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))

wxrc_wxrc.o: $(srcdir)/wxrc.cpp
	$(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $(srcdir)/wxrc.cpp

Lines 922-927 Link Here

(-)wxPython-src-2.6.3.3-orig/wx-config.in (-1 / +2 lines)
922	for _util in "${input_option_utility}-@WX_RELEASE@@WX_FLAVOUR@" \	922	for _util in "${input_option_utility}-@WX_RELEASE@@WX_FLAVOUR@" \
923	"${input_option_utility}-@WX_RELEASE@" \	923	"${input_option_utility}-@WX_RELEASE@" \
		924	"${input_option_utility}-@TOOLCHAIN_NAME@" \
924	"${input_option_utility}"	925	"${input_option_utility}"
925	do	926	do
926	for p in ${_user_prefix:+$_user_prefix/bin} $bindir $PATH; do	927	for p in ${_user_prefix:+$_user_prefix/bin} $bindir $PATH; do
Lines 1143-1149 Link Here
1143	_include_cppflags="-I${includedir} -I${prefix}/contrib/include"	1143	_include_cppflags="-I${includedir} -I${prefix}/contrib/include"
1144	fi	1144	fi
1145		1145
1146	_cppflags=$(echo "-I${libdir}/wx/include/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")	1146	_cppflags=$(echo "-I${includedir}/wx-@WX_RELEASE@/@TOOLCHAIN_FULLNAME@" $_include_cppflags "@WXDEBUG_DEFINE@" "@TOOLCHAIN_DEFS@" "@TOOLCHAIN_DLL_DEFS@" $_gui_cppflags "@WXCONFIG_INCLUDE@" "@WX_LARGEFILE_FLAGS@" "@GCC_PRAGMA_FLAGS@")
1147		1147
1148	# now without further ado, we can answer these too.	1148	# now without further ado, we can answer these too.
1149	[ -z "$output_option_cppflags" ] \|\| echo $_cppflags	1149	[ -z "$output_option_cppflags" ] \|\| echo $_cppflags

Return to bug 178824

Lines 24-29 Link Here

(-)wxPython-src-2.6.3.3-orig/Makefile.in (-13 / +7 lines)
24	SONAME_FLAG = @SONAME_FLAG@	24	SONAME_FLAG = @SONAME_FLAG@
25	STRIP = @STRIP@	25	STRIP = @STRIP@
26	INSTALL_PROGRAM = @INSTALL_PROGRAM@	26	INSTALL_PROGRAM = @INSTALL_PROGRAM@
		27	INSTALL_SCRIPT = @INSTALL_SCRIPT@
27	INSTALL_DATA = @INSTALL_DATA@	28	INSTALL_DATA = @INSTALL_DATA@
28	INSTALL_DIR = @INSTALL_DIR@	29	INSTALL_DIR = @INSTALL_DIR@
29	srcdir = @srcdir@	30	srcdir = @srcdir@
Lines 9401-9416 Link Here
9401		9402
9402	install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___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_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___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)	9403	install: all $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___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_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___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)
9403	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal	9404	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
9404	(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)	9405	(cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal/wxwin$(WX_RELEASE_NODOT).m4)
9405	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets	9406	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
9406	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)	9407	(cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx}; done)
9407	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx	9408	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx
9408	for f in setup.h $(RCDEFS_H); do \	9409	(cd ./ ; $(INSTALL_DATA) lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx/setup.h $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)/$(TOOLCHAIN_FULLNAME)/wx)
9409	if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
9410	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f`; \
9411	fi; \
9412	$(INSTALL_DATA) ./lib/wx/include/$(TOOLCHAIN_FULLNAME)/wx//$$f $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/$$f; \
9413	done
9414	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)	9410	$(INSTALL_DIR) $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)
9415	for f in $(ALL_HEADERS); do \	9411	for f in $(ALL_HEADERS); do \
9416	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \	9412	if test ! -d $(DESTDIR)$(includedir)/wx-$(WX_RELEASE)$(WX_FLAVOUR)/`dirname $$f` ; then \
Lines 9943-9951 Link Here
9943		9939
9944	install-wxconfig:	9940	install-wxconfig:
9945	$(INSTALL_DIR) $(DESTDIR)$(bindir)	9941	$(INSTALL_DIR) $(DESTDIR)$(bindir)
9946	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config	9942	$(INSTALL_SCRIPT) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(bindir)/wx$(TOOLCHAIN_NAME)-config
9947	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
9948	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
9949		9943
9950	locale_install:	9944	locale_install:
9951	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale	9945	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
Lines 9953-9959 Link Here
9953	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \	9947	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
9954	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \	9948	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
9955	if test -f $(srcdir)/locale/$$l.mo ; then \	9949	if test -f $(srcdir)/locale/$$l.mo ; then \
9956	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \	9950	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
9957	fi ; \	9951	fi ; \
9958	done	9952	done
9959		9953

Lines 28-33 Link Here

(-)wxPython-src-2.6.3.3-orig/utils/wxrc/Makefile.in (-3 / +2 lines)
28	TOOLKIT = @TOOLKIT@	28	TOOLKIT = @TOOLKIT@
29	TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@	29	TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
30	TOOLKIT_VERSION = @TOOLKIT_VERSION@	30	TOOLKIT_VERSION = @TOOLKIT_VERSION@
		31	TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
31	EXTRALIBS = @EXTRALIBS@	32	EXTRALIBS = @EXTRALIBS@
32	EXTRALIBS_XML = @EXTRALIBS_XML@	33	EXTRALIBS_XML = @EXTRALIBS_XML@
33	EXTRALIBS_GUI = @EXTRALIBS_GUI@	34	EXTRALIBS_GUI = @EXTRALIBS_GUI@
Lines 120-128 Link Here
120		121
121	@COND_USE_XRC_1@install_wxrc:	122	@COND_USE_XRC_1@install_wxrc:
122	@COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)	123	@COND_USE_XRC_1@ $(INSTALL_DIR) $(DESTDIR)$(bindir)
123	@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)	124	@COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(TOOLCHAIN_NAME)
124	@COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
125	@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
126		125
127	wxrc_wxrc.o: $(srcdir)/wxrc.cpp	126	wxrc_wxrc.o: $(srcdir)/wxrc.cpp
128	$(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $(srcdir)/wxrc.cpp	127	$(CXXC) -c -o $@ $(WXRC_CXXFLAGS) $(srcdir)/wxrc.cpp