Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1-build

into  mysql.com:/home/kent/bk/make-install/mysql-5.1-build

cmd-line-utils/libedit/Makefile.am

@@ -21,9 +21,9 @@ EXTRA_libedit_a_SOURCES =	np/unvis.c np/strlcpy.c np/vis.c np/strlcat.c \
 libedit_a_LIBADD = 		@LIBEDIT_LOBJECTS@
 libedit_a_DEPENDENCIES 	= 	@LIBEDIT_LOBJECTS@
 
-pkginclude_HEADERS =	readline/readline.h
-
-noinst_HEADERS =	chared.h el.h el_term.h histedit.h key.h parse.h refresh.h sig.h \
+noinst_HEADERS =	readline/readline.h \
+\
+			chared.h el.h el_term.h histedit.h key.h parse.h refresh.h sig.h \
 			sys.h tokenizer.h config.h hist.h map.h prompt.h read.h \
 			search.h tty.h libedit_term.h vis.h
 

cmd-line-utils/readline/Makefile.am

@@ -20,11 +20,11 @@ libreadline_a_SOURCES =	readline.c funmap.c keymaps.c \
 			shell.c tilde.c misc.c text.c mbutil.c \
 			compat.c savestring.c
 
-pkginclude_HEADERS =	readline.h chardefs.h keymaps.h \
+noinst_HEADERS =	readline.h chardefs.h keymaps.h \
 			history.h tilde.h rlmbutil.h rltypedefs.h rlprivate.h \
-			rlshell.h xmalloc.h
-
-noinst_HEADERS =	config_readline.h rldefs.h histlib.h rlwinsize.h \
+			rlshell.h xmalloc.h \
+\
+			config_readline.h rldefs.h histlib.h rlwinsize.h \
 			posixstat.h posixdir.h posixjmp.h \
 			tilde.h rlconf.h rltty.h ansi_stdlib.h \
 			tcap.h rlstdc.h

scripts/Makefile.am

@@ -135,6 +135,8 @@ SUFFIXES = .sh
 	  -e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
 	  -e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
 	  -e 's!@''sysconfdir''@!$(sysconfdir)!g' \
+	  -e 's!@''mandir''@!$(mandir)!g' \
+	  -e 's!@''infodir''@!$(infodir)!g' \
 	  -e 's!@''CC''@!@CC@!'\
 	  -e 's!@''CXX''@!@CXX@!'\
 	  -e 's!@''GXX''@!@GXX@!'\

support-files/Makefile.am

@@ -34,7 +34,10 @@ EXTRA_DIST =		mysql.spec.sh \
 
 SUBDIRS =		MacOSX RHEL4-SElinux
 
-pkgdata_DATA =		my-small.cnf \
+# Default same as 'pkgdatadir', but we can override it
+pkgsuppdir =		$(datadir)/@PACKAGE@
+
+pkgsupp_DATA =		my-small.cnf \
 			my-medium.cnf \
 			my-large.cnf \
 			my-huge.cnf \
@@ -43,7 +46,7 @@ pkgdata_DATA =		my-small.cnf \
 			binary-configure \
 			ndb-config-2-node.ini
 
-pkgdata_SCRIPTS =	mysql.server \
+pkgsupp_SCRIPTS =	mysql.server \
 			mysqld_multi.server
 
 aclocaldir =		$(datadir)/aclocal