Updates for make dist for OSX_CARBON

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

diff --git a/Makefile.in b/Makefile.in
index 61deb7c5ef649be64d5d8097d69bfb9cb5df00d4..8a1b50bf8a866bd611e8563efbd6ab7397e906d9 100644 (file)
--- 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 3431cfcf4fc943a8b0f12a5c216853430bf497ea..6c6a72c299ab315357c83a8a21409ef0da4e33b9 100644 (file)
--- 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 78ff1183e292279591ea7e320b82581dcce5bccd..dec2bd7916893abfc4678dd33654a343308580f7 100644 (file)
--- 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)