Skip to content

Commit

Permalink
install locale files as part of wxBase; name directory created by BAS…
Browse files Browse the repository at this point in the history
…E_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
  • Loading branch information
vadz committed Aug 4, 2006
1 parent 8fb8adf commit daca904
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion Makefile.in
Expand Up @@ -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 ###############################

Expand Down Expand Up @@ -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/' \
Expand Down Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion build/bakefiles/make_dist.mk
Expand Up @@ -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 ###############################

Expand Down Expand Up @@ -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/' \
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit daca904

Please sign in to comment.