From 5ceb470c91aa426a369a91a5fab802f458c77f13 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 18 Jul 2015 15:01:10 +0200
Subject: [PATCH] Correct wx/osx/activityindicator.h file name in "make
 install".

It's in osx, not osx/cocoa subdirectory.
---
 Makefile.in               | 4 ++--
 build/bakefiles/files.bkl | 2 +-
 build/files               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 947dd80d4c..2d2e47810d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3802,6 +3802,7 @@ COND_TOOLKIT_OSX_CARBON_ADVANCED_PLATFORM_HDR =  \
 @COND_TOOLKIT_OSX_CARBON@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_OSX_CARBON_ADVANCED_PLATFORM_HDR)
 COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR =  \
 	wx/generic/animate.h \
+	wx/osx/activityindicator.h \
 	wx/osx/dataview.h \
 	wx/osx/datectrl.h \
 	wx/osx/datetimectrl.h \
@@ -3812,8 +3813,7 @@ COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR =  \
 	wx/osx/taskbarosx.h \
 	wx/osx/timectrl.h \
 	wx/osx/core/joystick.h \
-	wx/osx/cocoa/dataview.h \
-	wx/osx/cocoa/activityindicator.h
+	wx/osx/cocoa/dataview.h
 @COND_TOOLKIT_OSX_COCOA@ADVANCED_PLATFORM_HDR = $(COND_TOOLKIT_OSX_COCOA_ADVANCED_PLATFORM_HDR)
 @COND_TOOLKIT_OSX_IPHONE@ADVANCED_PLATFORM_HDR = \
 @COND_TOOLKIT_OSX_IPHONE@	wx/generic/animate.h wx/osx/sound.h
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 4526caee00..925d6a3e84 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -3127,6 +3127,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="ADVANCED_OSX_COCOA_HDR" hints="files">
     wx/generic/animate.h
+    wx/osx/activityindicator.h
     wx/osx/dataview.h
     wx/osx/datectrl.h
     wx/osx/datetimectrl.h
@@ -3138,7 +3139,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/timectrl.h
     wx/osx/core/joystick.h
     wx/osx/cocoa/dataview.h
-    wx/osx/cocoa/activityindicator.h
 </set>
 
 <set var="ADVANCED_OSX_IPHONE_SRC" hints="files">
diff --git a/build/files b/build/files
index d582b8ef3e..b388423eb5 100644
--- a/build/files
+++ b/build/files
@@ -2690,6 +2690,7 @@ ADVANCED_OSX_COCOA_SRC =
 
 ADVANCED_OSX_COCOA_HDR =
     wx/generic/animate.h
+    wx/osx/activityindicator.h
     wx/osx/dataview.h
     wx/osx/datectrl.h
     wx/osx/datetimectrl.h
@@ -2700,7 +2701,6 @@ ADVANCED_OSX_COCOA_HDR =
     wx/osx/taskbarosx.h
     wx/osx/timectrl.h
     wx/osx/core/joystick.h
-    wx/osx/cocoa/activityindicator.h
     wx/osx/cocoa/dataview.h
 
 ADVANCED_OSX_IPHONE_SRC =