fixed AFM metrics installation so that PostScript printing works again

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29734 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/Makefile.in b/Makefile.in
index 3a7d0b597ef00032cff3aa89c4b9df4fbf894bc1..e102070303b20ff76935327c9541569976980aa9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -7878,12 +7878,12 @@ samples:
 @COND_USE_XRC_1@       (cd utils/wxrc && $(MAKE) all)
 
 @COND_USE_GUI_1@install-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_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-gsafm: 
-@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)
+@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)
 
 install-wxconfig: 
        $(INSTALL_DIR) $(DESTDIR)$(bindir)

diff --git a/build/bakefiles/wx.bkl b/build/bakefiles/wx.bkl
index 8fd2a80e71e76e799e00a51ccbf4fe14ee54aa54..1df6355a627e1f9798881f8e6015e1899889e497 100644 (file)
--- a/build/bakefiles/wx.bkl
+++ b/build/bakefiles/wx.bkl
@@ -60,11 +60,11 @@
 
         <data-files-tg id="install-afm" cond="USE_GUI=='1'">
             <files>misc/afm/*.afm</files>
-            <install-to>$(DATADIR)/wx/afm</install-to>
+            <install-to>$(DATADIR)/wx/$(WX_RELEASE)/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/gs_afm</install-to>
+            <install-to>$(DATADIR)/wx/$(WX_RELEASE)/gs_afm</install-to>
         </data-files-tg>
 
         <action id="install-wxconfig">