summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Perkin <jonathan.perkin@oracle.com>2010-04-28 11:52:26 +0200
committerJonathan Perkin <jonathan.perkin@oracle.com>2010-04-28 11:52:26 +0200
commit66e64814089f5a0862e61c58bc6cf6dbfad1873a (patch)
tree695737ed6bc9d5ea7ece91cdcd3a9c24aa6f43d6
parent40e3b674474290096bd7236718e6f70c672f3dab (diff)
downloadmariadb-git-66e64814089f5a0862e61c58bc6cf6dbfad1873a.tar.gz
Try to fix the manual again, and a kent change
-rw-r--r--man/CMakeLists.txt3
-rw-r--r--support-files/mysql.spec.sh1
2 files changed, 2 insertions, 2 deletions
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt
index d437e9a0c76..beae58bc2c2 100644
--- a/man/CMakeLists.txt
+++ b/man/CMakeLists.txt
@@ -15,9 +15,10 @@
# Copy man pages
FILE(GLOB MAN1_FILES *.1)
+FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1)
FILE(GLOB MAN8_FILES *.8)
IF(MAN1_FILES)
- LIST(REMOVE_ITEM MAN1_FILES "make_win_bin_dist.1")
+ LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE})
INSTALL(FILES ${MAN1_FILES} DESTINATION ${INSTALL_MANDIR}/man1)
ENDIF()
IF(MAN8_FILES)
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 1803ce9f8e8..3f5f4282310 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -820,7 +820,6 @@ fi
# ----------------------------------------------------------------------------
%files -n %{name}-embedded
%defattr(-, root, root, 0755)
-%attr(755, root, root) %{_bindir}/mysql_embedded
%attr(644, root, root) %{_libdir}/mysql/libmysqld.a
%attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a