Fix (workaround?) for rpmspec.

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 0a935ca153dd2dadcc520d08c9cb0d351ca5dee0..facd539cf4ed48f084faf3bf7fca583882cb5fb8 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -403,7 +403,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mimetype.h
     wx/module.h
     wx/msgout.h
     wx/mimetype.h
     wx/module.h
     wx/msgout.h

-    wx/msgout.h

     wx/mstream.h
     wx/object.h
     wx/platform.h
     wx/mstream.h
     wx/object.h
     wx/platform.h


@@ -2789,8 +2788,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT==''">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
     </set>
     <set var="BASE_PLATFORM_HDR" hints="files">
         <if cond="TOOLKIT==''">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
     </set>
     <set var="BASE_PLATFORM_HDR" hints="files">

-        <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
-        <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
+        <if cond="PLATFORM_UNIX=='1' or FORMAT=='rpmspec'">$(BASE_UNIX_HDR)</if>
+        <if cond="PLATFORM_WIN32=='1' and FORMAT!='rpmspec'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>

         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_HDR)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_HDR)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>

diff --git a/build/bakefiles/formats/rpmspec.empy b/build/bakefiles/formats/rpmspec.empy
index a4cce6a7662d88d3ac58a9c683d0e7c801ceb659..5447f4422696441fccbe767e2fc5ffca6f10e8f9 100644 (file)
--- a/build/bakefiles/formats/rpmspec.empy
+++ b/build/bakefiles/formats/rpmspec.empy
@@ -1,5 +1,5 @@
 # --- wxBase headers list begins here ---
 # --- wxBase headers list begins here ---

-cat <<EOF >wxbase-headers-list
+cat <<EOF >wxbase-headers.files

 @('\n'.join(ALL_BASE_HEADERS.split()))
 EOF
 # --- wxBase headers list ends here ---
 @('\n'.join(ALL_BASE_HEADERS.split()))
 EOF
 # --- wxBase headers list ends here ---