Revert previous commit

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

diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 4e8fb48f81ae76043df3fcfff17929f35814bd0c..c95548b3489d277a08e1808bf9b229c634d25b3c 100644 (file)
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2788,8 +2788,7 @@ 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="FORMAT=='rpmspec'">$(BASE_UNIX_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_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>


@@ -2814,8 +2813,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
     </set>
     <set var="NET_PLATFORM_HDR" hints="files">
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_SRC)</if>
     </set>
     <set var="NET_PLATFORM_HDR" hints="files">

-        <if cond="PLATFORM_UNIX=='1'">$(NET_UNIX_HDR)</if>
-        <if cond="FORMAT=='rpmspec'">$(NET_UNIX_HDR)</if>
+        <if cond="PLATFORM_UNIX=='1' or FORMAT=='rpmspec'">$(NET_UNIX_HDR)</if>

         <if cond="PLATFORM_WIN32=='1' and FORMAT!='rpmspec'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_HDR)</if>
         <if cond="PLATFORM_WIN32=='1' and FORMAT!='rpmspec'">$(NET_WIN32_HDR) $(NET_WINCE_HDR)</if>
         <if cond="PLATFORM_OS2=='1'">$(NET_OS2_HDR)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(NET_UNIX_HDR)</if>