Removed the "include/" from the corefoundation headers in files.bkl so

they will actually get installed.  I expect that the other "include/"
prefixes need to be removed too but I left them in case I am wrong.

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

diff --git a/Makefile.in b/Makefile.in
index 4d610cabb5f91113b8faedfb529d4d2624560c66..d167f2c1c0ed0ccaff65f360b0dfba7e21495510 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1229,10 +1229,9 @@ COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR =  \
        wx/unix/pipe.h \
        wx/unix/stdpaths.h
 @COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = $(COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR)
        wx/unix/pipe.h \
        wx/unix/stdpaths.h
 @COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = $(COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR)

-COND_TOOLKIT_MAC_BASE_PLATFORM_HDR =  \
-       include/wx/mac/corefoundation/cfstring.h \
-       include/wx/mac/corefoundation/stdpaths.h
-@COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = $(COND_TOOLKIT_MAC_BASE_PLATFORM_HDR)
+@COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = \
+@COND_TOOLKIT_MAC@     wx/mac/corefoundation/cfstring.h \
+@COND_TOOLKIT_MAC@     wx/mac/corefoundation/stdpaths.h

 @COND_PLATFORM_MACOSX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_PLATFORM_MACOS_1@NET_PLATFORM_HDR = include/wx/mac/carbon/gsockmac.h
 @COND_PLATFORM_OS2_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_PLATFORM_MACOSX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
 @COND_PLATFORM_MACOS_1@NET_PLATFORM_HDR = include/wx/mac/carbon/gsockmac.h
 @COND_PLATFORM_OS2_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index d1581683f96973ccd9a25c3687d116d57e21c720..2619358894fead8165a3ff9e5d144c4a0594f486 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -146,8 +146,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
 <set var="BASE_MAC_HDR" hints="files">
     <!-- Shared wxMac and wxCocoa files -->
 
 <set var="BASE_MAC_HDR" hints="files">
     <!-- Shared wxMac and wxCocoa files -->

-    include/wx/mac/corefoundation/cfstring.h
-    include/wx/mac/corefoundation/stdpaths.h
+    wx/mac/corefoundation/cfstring.h
+    wx/mac/corefoundation/stdpaths.h

 </set>
 
 <set var="BASE_OS2_SRC" hints="files">
 </set>
 
 <set var="BASE_OS2_SRC" hints="files">