Commit d41b660b authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/kent/bk/mysql-5.0-build
parents c8b23c37 89a71063

Docs/Makefile.am

+6 −6
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ all-local: $(TXT_FILES) 
# make sure that "make install" installs the info page, too

# automake only seems to take care of this automatically,

# if we're building the info page from texi directly.

install-data-hook:	mysql.info

install-data-hook:	$(srcdir)/mysql.info

	$(mkinstalldirs) $(DESTDIR)$(infodir)

	$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)
@@ -44,22 +44,22 @@ CLEAN_FILES: $(TXT_FILES) 


GT = $(srcdir)/Support/generate-text-files.pl



../INSTALL-SOURCE:	mysql.info $(GT)

../INSTALL-SOURCE:	$(srcdir)/mysql.info $(GT)

	perl -w $(GT) $(srcdir)/mysql.info "installing-source" "windows-source-build" > $@



../INSTALL-WIN-SOURCE:	mysql.info $(GT)

../INSTALL-WIN-SOURCE:	$(srcdir)/mysql.info $(GT)

	perl -w $(GT) $(srcdir)/mysql.info "windows-source-build" "post-installation" > $@



# We put the description for the binary installation here so that

# people who download source wont have to see it. It is moved up to

# the toplevel by the script that makes the binary tar files.

INSTALL-BINARY:	mysql.info $(GT)

INSTALL-BINARY:	$(srcdir)/mysql.info $(GT)

	perl -w $(GT) $(srcdir)/mysql.info "installing-binary" "installing-source" > $@



../EXCEPTIONS-CLIENT: mysql.info $(GT)

../EXCEPTIONS-CLIENT: $(srcdir)/mysql.info $(GT)

	perl -w $(GT) $(srcdir)/mysql.info "mysql-floss-license-exception" "function-index" > $@



../support-files/MacOSX/ReadMe.txt:	mysql.info $(GT)

../support-files/MacOSX/ReadMe.txt:	$(srcdir)/mysql.info $(GT)

	perl -w $(GT) $(srcdir)/mysql.info "mac-os-x-installation" "netware-installation" > $@



# Don't update the files from bitkeeper

sql/Makefile.am

+5 −2
Original line number Diff line number Diff line
@@ -148,12 +148,15 @@ mysql_tzinfo_to_sql.o: $(mysql_tzinfo_to_sql_SOURCES) 
sql_yacc.cc:	sql_yacc.yy

sql_yacc.h:	sql_yacc.yy



# Be careful here, note that we use VPATH and might or might not have

# a pregenerated "sql_yacc.cc" in $(srcdir) or one we just built in

# $(builddir). And it has to work if $(srcdir) == $(builddir).

sql_yacc.o:	sql_yacc.cc sql_yacc.h $(HEADERS)

		@SED@ -e 's/__attribute__ ((__unused__))//' sql_yacc.cc > sql_yacc.cc-new

		@SED@ -e 's/__attribute__ ((__unused__))//' $< > sql_yacc.cc-new

		@MV@ sql_yacc.cc-new sql_yacc.cc

		@echo "Note: The following compile may take a long time."

		@echo "If it fails, re-run configure with --with-low-memory"

		$(CXXCOMPILE) $(LM_CFLAGS) -c $<

		$(CXXCOMPILE) $(LM_CFLAGS) -c sql_yacc.cc



# This generates lex_hash.h

# NOTE Built sources should depend on their sources not the tool