Commit 892e3a41 authored by unknown's avatar unknown
Browse files

Bug#19738 "make install" tries to build files that "make" should already have built 

 - Move comp_err to EXTRA_PROGRAMS, it will not be installed from 5.1 and up.


extra/Makefile.am:
  Move comp_err to EXTRA_PROGRAMS, it will only be built if any of the files it prodcues need to be rebuilt
support-files/mysql.spec.sh:
  Remove comp_err from files to install
parent e0243f8c

extra/Makefile.am

+2 −1
Original line number Diff line number Diff line
@@ -41,9 +41,10 @@ $(top_builddir)/include/mysqld_error.h: comp_err.c \ 
$(top_builddir)/include/mysqld_ername.h: $(top_builddir)/include/mysqld_error.h

$(top_builddir)/include/sql_state.h: $(top_builddir)/include/mysqld_error.h



bin_PROGRAMS =		replace comp_err perror resolveip my_print_defaults \

bin_PROGRAMS =		replace perror resolveip my_print_defaults \

			resolve_stack_dump mysql_waitpid innochecksum

noinst_PROGRAMS =	charset2html

EXTRA_PROGRAMS =	comp_err

EXTRA_DIST =		CMakeLists.txt



perror.o: perror.c

support-files/mysql.spec.sh

+0 −1
Original line number Diff line number Diff line
@@ -640,7 +640,6 @@ fi 
%defattr(-, root, root, 0755)

%doc mysql-release-%{mysql_version}/EXCEPTIONS-CLIENT

%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*

%attr(755, root, root) %{_bindir}/comp_err

%attr(755, root, root) %{_bindir}/mysql_config

%dir %attr(755, root, root) %{_includedir}/mysql

%dir %attr(755, root, root) %{_libdir}/mysql