From 8f70a1ea881056e07e1786ab87c798ad50d74b32 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 4 Aug 2006 23:09:04 +0000 Subject: [PATCH] install locale files as part of wxBase; name directory created by BASE_DIST wxBase-x.y and not wxGTK-x.y git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40460 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 5 ++++- build/bakefiles/make_dist.mk | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 0bb476cd21..77f655ec9e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -27293,6 +27293,7 @@ WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(WX_VERSION).tar.bz2 DISTDIRNAME=@DISTDIR@-$(WX_VERSION) DISTDIR=./_dist_dir/$(DISTDIRNAME) +BASEDISTDIR=./_dist_dir/wxBase-$(WX_VERSION) ########################## Tools ############################### @@ -27442,7 +27443,7 @@ ALL_GUI_DIST: ALL_DIST $(CP_P) $(TIFFDIR)/*.c $(DISTDIR)/src/tiff $(CP_P) $(TIFFDIR)/README $(DISTDIR)/src/tiff -BASE_DIST: ALL_DIST +BASE_DIST: ALL_DIST INTL_DIST # make --disable-gui the default rm $(DISTDIR)/configure.in sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \ @@ -27512,6 +27513,8 @@ BASE_DIST: ALL_DIST $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.rc $(DISTDIR)/utils/tex2rtf/src $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.xpm $(DISTDIR)/utils/tex2rtf/src + mv $(DISTDIR) $(BASEDISTDIR) + GTK_DIST: UNIV_DIST $(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR) $(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 42e87e453f..5ef1f92d02 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -62,6 +62,7 @@ WXDEMOS_BZIP=wx$(TOOLKIT)-demos-$(WX_VERSION).tar.bz2 DISTDIRNAME=@DISTDIR@-$(WX_VERSION) DISTDIR=./_dist_dir/$(DISTDIRNAME) +BASEDISTDIR=./_dist_dir/wxBase-$(WX_VERSION) ########################## Tools ############################### @@ -211,7 +212,7 @@ ALL_GUI_DIST: ALL_DIST $(CP_P) $(TIFFDIR)/*.c $(DISTDIR)/src/tiff $(CP_P) $(TIFFDIR)/README $(DISTDIR)/src/tiff -BASE_DIST: ALL_DIST +BASE_DIST: ALL_DIST INTL_DIST # make --disable-gui the default rm $(DISTDIR)/configure.in sed 's/DEFAULT_wxUSE_GUI=yes/DEFAULT_wxUSE_GUI=no/' \ @@ -281,6 +282,8 @@ BASE_DIST: ALL_DIST $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.rc $(DISTDIR)/utils/tex2rtf/src $(CP_P) $(UTILSDIR)/tex2rtf/src/tex2rtf.xpm $(DISTDIR)/utils/tex2rtf/src + mv $(DISTDIR) $(BASEDISTDIR) + GTK_DIST: UNIV_DIST $(CP_P) $(WXDIR)/wxGTK.spec $(DISTDIR) $(CP_P) $(INCDIR)/wx/gtk/*.h $(DISTDIR)/include/wx/gtk -- 2.50.0