From 10f206ad20fc410d57885a2d0e143a3c52075834 Mon Sep 17 00:00:00 2001
From: Ron Lee <ron@debian.org>
Date: Fri, 15 Oct 2004 07:50:21 +0000
Subject: [PATCH] For autoconf/unix builds update the hardcoded afm dir too.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29871 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 Makefile.in             | 8 ++++----
 build/bakefiles/wx.bkl  | 4 ++--
 src/common/utilscmn.cpp | 9 ++-------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index bba48b54a1..b54c78b1c2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7883,12 +7883,12 @@ samples:
 @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_DIR) $(DESTDIR)$(datadir)/wx/$(WX_RELEASE)/afm
-@COND_USE_GUI_1@	(cd $(srcdir) ; $(INSTALL_DATA)  misc/afm/*.afm $(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/afm)
 
 @COND_USE_GUI_1@install-gsafm: 
-@COND_USE_GUI_1@	$(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/$(WX_RELEASE)/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@	$(INSTALL_DIR) $(DESTDIR)$(datadir)/wx/gs_afm
+@COND_USE_GUI_1@	(cd $(srcdir) ; $(INSTALL_DATA)  misc/gs_afm/*.afm $(DESTDIR)$(datadir)/wx/gs_afm)
 
 install-wxconfig: 
 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index bec77bf7ce..8b8b4cdcb6 100644
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -76,11 +76,11 @@
 
         <data-files-tg id="install-afm" cond="USE_GUI=='1'">
             <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 id="install-gsafm" cond="USE_GUI=='1'">
             <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>
 
         <action id="install-wxconfig">
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index db74590edf..4e4d3a9280 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -287,13 +287,8 @@ const wxChar *wxGetInstallPrefix()
 
 wxString wxGetDataDir()
 {
-    wxString format = wxGetInstallPrefix();
-    format <<  wxFILE_SEP_PATH
-           << wxT("share") << wxFILE_SEP_PATH
-           << wxT("wx") << wxFILE_SEP_PATH
-           << wxT("%i.%i");
-    wxString dir;
-    dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
+    wxString dir = wxGetInstallPrefix();
+    dir <<  wxFILE_SEP_PATH << wxT("share") << wxFILE_SEP_PATH << wxT("wx");
     return dir;
 }
 
-- 
2.45.2