From 92a50a3990f5c1a96f8533680b5cabe28245cfdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 8 Oct 2004 16:26:51 +0000 Subject: [PATCH] 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 --- Makefile.in | 8 ++++---- build/bakefiles/wx.bkl | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3a7d0b597e..e102070303 100644 --- 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 8fd2a80e71..1df6355a62 100644 --- a/build/bakefiles/wx.bkl +++ b/build/bakefiles/wx.bkl @@ -60,11 +60,11 @@ misc/afm/*.afm - $(DATADIR)/wx/afm + $(DATADIR)/wx/$(WX_RELEASE)/afm misc/gs_afm/*.afm - $(DATADIR)/wx/gs_afm + $(DATADIR)/wx/$(WX_RELEASE)/gs_afm