From a116258895d6df17aa6e955ae67286cd4ba999a7 Mon Sep 17 00:00:00 2001
From: unknown <msvensson@shellback.(none)>
Date: Wed, 20 Sep 2006 08:56:57 +0200
Subject: [PATCH 1/2] Bug#19738 "make install" tries to build files that "make"
 should already have built  - Move gen_lex_hash to EXTRA_PROGRAMS

sql/Makefile.am:
  Move gen_lex_hash to EXTRA_PROGRAMS, this will make it be built only when lex_hash.h need to be rebuilt
---
 sql/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/Makefile.am b/sql/Makefile.am
index a106a2773f1..73aadf8d687 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -27,7 +27,7 @@ INCLUDES =		@ZLIB_INCLUDES@ \
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld
-noinst_PROGRAMS =	gen_lex_hash
+EXTRA_PROGRAMS =	gen_lex_hash
 bin_PROGRAMS =		mysql_tzinfo_to_sql
 gen_lex_hash_LDFLAGS =  @NOINST_LDFLAGS@
 LDADD =			$(top_builddir)/myisam/libmyisam.a \

From 892e3a4107ecb7adf80b4df90feb9cc3fa3de5ba Mon Sep 17 00:00:00 2001
From: unknown <msvensson@shellback.(none)>
Date: Wed, 20 Sep 2006 09:28:12 +0200
Subject: [PATCH 2/2] 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
---
 extra/Makefile.am           | 3 ++-
 support-files/mysql.spec.sh | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/Makefile.am b/extra/Makefile.am
index eed1f509631..81a6f5f5cb9 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -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 
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 20bfd7188d2..618886fe858 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -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