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

For autoconf/unix builds update the hardcoded afm dir too.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2004-10-15 07:50:21 +00:00
parent b1433926f2
commit 10f206ad20
3 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.in
View File

@@ -7883,12 +7883,12 @@ samples:
@COND_USE_XRC_1@ (test -d utils/wxrc && cd utils/wxrc && $(MAKE) install) || true @COND_USE_XRC_1@ (test -d utils/wxrc && cd utils/wxrc && $(MAKE) install) || true
@COND_USE_GUI_1@install-afm: @COND_USE_GUI_1@install-afm:
@COND_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/$(WX_RELEASE)/afm @COND_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/afm
@COND_USE_GUI_1@ (cd $(srcdir) ; $(INSTALL_DATA) misc/afm/*.afm $(DESTDIR)$(datadir)/wx/$(WX_RELEASE)/afm) @COND_USE_GUI_1@ (cd $(srcdir) ; $(INSTALL_DATA) misc/afm/*.afm $(DESTDIR)$(datadir)/wx/afm)
@COND_USE_GUI_1@install-gsafm: @COND_USE_GUI_1@install-gsafm:
@COND_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/$(WX_RELEASE)/gs_afm @COND_USE_GUI_1@ $(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/gs_afm
@COND_USE_GUI_1@ (cd $(srcdir) ; $(INSTALL_DATA) misc/gs_afm/*.afm $(DESTDIR)$(datadir)/wx/$(WX_RELEASE)/gs_afm) @COND_USE_GUI_1@ (cd $(srcdir) ; $(INSTALL_DATA) misc/gs_afm/*.afm $(DESTDIR)$(datadir)/wx/gs_afm)
install-wxconfig: install-wxconfig:
$(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_DIR) $(DESTDIR)$(bindir)

4
build/bakefiles/wx.bkl
View File

@@ -76,11 +76,11 @@
<data-files-tg id="install-afm" cond="USE_GUI=='1'"> <data-files-tg id="install-afm" cond="USE_GUI=='1'">
<files>misc/afm/*.afm</files> <files>misc/afm/*.afm</files>
<install-to>$(DATADIR)/wx/$(WX_RELEASE)/afm</install-to> <install-to>$(DATADIR)/wx/afm</install-to>
</data-files-tg> </data-files-tg>
<data-files-tg id="install-gsafm" cond="USE_GUI=='1'"> <data-files-tg id="install-gsafm" cond="USE_GUI=='1'">
<files>misc/gs_afm/*.afm</files> <files>misc/gs_afm/*.afm</files>
<install-to>$(DATADIR)/wx/$(WX_RELEASE)/gs_afm</install-to> <install-to>$(DATADIR)/wx/gs_afm</install-to>
</data-files-tg> </data-files-tg>
<action id="install-wxconfig"> <action id="install-wxconfig">

9
src/common/utilscmn.cpp
View File

@@ -287,13 +287,8 @@ const wxChar *wxGetInstallPrefix()
wxString wxGetDataDir() wxString wxGetDataDir()
{ {
wxString format = wxGetInstallPrefix(); wxString dir = wxGetInstallPrefix();
format << wxFILE_SEP_PATH dir << wxFILE_SEP_PATH << wxT("share") << wxFILE_SEP_PATH << wxT("wx");
<< wxT("share") << wxFILE_SEP_PATH
<< wxT("wx") << wxFILE_SEP_PATH
<< wxT("%i.%i");
wxString dir;
dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
return dir; return dir;
} }