From 4aa7709b73750737133ef33168cb159ca7ae464a Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Fri, 17 Oct 2008 12:39:21 +0000 Subject: [PATCH] Updates for make dist for OSX_CARBON git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56400 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- Makefile.in | 2 +- build/bakefiles/make_dist.mk | 2 +- configure.in | 10 +++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 61deb7c5ef..8a1b50bf8a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33468,7 +33468,7 @@ MOTIF_DIST: ALL_GUI_DIST $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \ $(DISTDIR)/include/wx/x11 -MACX_DIST: ALL_GUI_DIST +OSX_CARBON_DIST: ALL_GUI_DIST $(CP_P) $(INCDIR)/*.* $(DISTDIR)/include mkdir $(DISTDIR)/include/wx/osx/carbon mkdir $(DISTDIR)/include/wx/osx/carbon/private diff --git a/build/bakefiles/make_dist.mk b/build/bakefiles/make_dist.mk index 3431cfcf4f..6c6a72c299 100644 --- a/build/bakefiles/make_dist.mk +++ b/build/bakefiles/make_dist.mk @@ -387,7 +387,7 @@ MOTIF_DIST: ALL_GUI_DIST $(X11INC)/bitmap.h $(X11INC)/glcanvas.h $(X11INC)/private.h $(X11INC)/region.h \ $(DISTDIR)/include/wx/x11 -MACX_DIST: ALL_GUI_DIST +OSX_CARBON_DIST: ALL_GUI_DIST $(CP_P) $(INCDIR)/*.* $(DISTDIR)/include mkdir $(DISTDIR)/include/wx/osx/carbon mkdir $(DISTDIR)/include/wx/osx/carbon/private diff --git a/configure.in b/configure.in index 78ff1183e2..dec2bd7916 100644 --- a/configure.in +++ b/configure.in @@ -7604,9 +7604,17 @@ AC_SUBST(UNICODE) AC_SUBST(BUILD) AC_SUBST(DEBUG_INFO) AC_SUBST(DEBUG_FLAG) +TOOLKIT_LOWERCASE=xxx if test "$TOOLKIT" = "MAC"; then TOOLKIT_LOWERCASE=osx -else +fi +if test "$TOOLKIT" = "OSX_CARBON"; then + TOOLKIT_LOWERCASE=osx +fi +if test "$TOOLKIT" = "OSX_COCOA"; then + TOOLKIT_LOWERCASE=osx +fi +if test "$TOOLKIT_LOWERCASE" = "xxx"; then TOOLKIT_LOWERCASE=`echo $TOOLKIT | tr '[[A-Z]]' '[[a-z]]'` fi AC_SUBST(TOOLKIT_LOWERCASE) -- 2.45.2