bzr push into mysql-5.6-wl6055 branch (bjorn.munch:4374 to 4375)

[Bjorn Munch]

 4375 Bjorn Munch	2012-10-04
      Another shot in the dark to fix RPM build

    modified:
      support-files/CMakeLists.txt
      support-files/mysql.spec.sh
 4374 Bjorn Munch	2012-10-03
      Shots in the dark to fix RPM and PKG builds

    modified:
      scripts/mysql_install_db.pl.in
      support-files/mysql.spec.sh
=== modified file 'support-files/CMakeLists.txt'
--- a/support-files/CMakeLists.txt	2012-10-03 15:00:39 +0000
+++ b/support-files/CMakeLists.txt	2012-10-03 22:53:04 +0000
@@ -40,17 +40,15 @@ ENDIF()
 # XXX: their configuration in install_layout.cmake?
 IF(WIN32)
   SET(inst_location ${INSTALL_DOCREADMEDIR})
-  SET(inst_default ${INSTALL_DOCREADMEDIR})
 ELSE()
   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
-  SET(inst_default ${INSTALL_SHAREDIR})
 ENDIF()
 
 FOREACH(inifile my-default)
   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
                  ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
-          DESTINATION ${inst_default} COMPONENT IniFiles)
+          DESTINATION ${inst_location} COMPONENT IniFiles)
 ENDFOREACH()
 
 IF(UNIX)

=== modified file 'support-files/mysql.spec.sh'
--- a/support-files/mysql.spec.sh	2012-10-03 19:59:16 +0000
+++ b/support-files/mysql.spec.sh	2012-10-03 22:53:04 +0000
@@ -988,7 +988,7 @@ echo "====="
 %doc %{src_dir}/Docs/ChangeLog
 %doc %{src_dir}/Docs/INFO_SRC*
 %doc release/Docs/INFO_BIN*
-%doc release/share/my-*.cnf
+%doc release/support-files/my-default.cnf
 
 %doc %attr(644, root, root) %{_infodir}/mysql.info*
 

No bundle (reason: useless for push emails).