diff options
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rwxr-xr-x | Build-tools/Do-patch-file | 4 | ||||
| -rw-r--r-- | Docs/Makefile.am | 3 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | support-files/mysql.spec.sh | 1 |
5 files changed, 9 insertions, 2 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index 215acb8b368..1889083f0c5 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -5,3 +5,4 @@ paul@central.snake.net sasha@mysql.sashanet.com sasha@work.mysql.com serg@serg.mysql.com +monty@work.mysql.com diff --git a/Build-tools/Do-patch-file b/Build-tools/Do-patch-file index a834b312fc2..5a26ac04a69 100755 --- a/Build-tools/Do-patch-file +++ b/Build-tools/Do-patch-file @@ -7,7 +7,7 @@ case $# in esac PVER=$1; -VER=`grep SERVER_VERSION include/mysql_version.h | cut -d'"' -f2` +VER=`grep SERVER_VERSION /my/tmp/BUILD/include/mysql_version.h | cut -d'"' -f2` NEWDIR="binary" NEW="mysql-$VER.tar.gz" OLD="mysql-$PVER.tar.gz" @@ -37,4 +37,6 @@ cd ../.. /bin/rm -rf patch chmod a+r,o-w $RESULT binary/* mv $RESULT $PATCH_DIR +cp binary/mysqlcom-* /net/web/home/production/data/nweb/customer/ +rm binary/mysqlcom-* cp binary/* $RESULT_DIR diff --git a/Docs/Makefile.am b/Docs/Makefile.am index 1e0c8e9665a..5593f495bf9 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -56,6 +56,9 @@ manual.txt: manual.texi include.texi manual.html: manual.texi include.texi $(srcdir)/Support/texi2html cd $(srcdir) && @PERL@ $(srcdir)/Support/texi2html $(TEXI2HTML_FLAGS) $< +manual_toc.html: manual.html + + # Fix: add --output-comment with some interesting info? # Fix: @image worked with a older version of pdftex. # Note: @image will work if we first convert all images to pdf ... diff --git a/include/Makefile.am b/include/Makefile.am index 83ba47dc219..17d9c95216c 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -45,7 +45,7 @@ link_sources: # This should be changed in the source and removed. my_global.h: global.h - -$(CHMOD) u+w my_global.h + $(RM) -f my_global.h $(CP) global.h my_global.h # These files should not be included in distributions since they are diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index 62811d32ccf..5b96bc4727c 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -159,6 +159,7 @@ sh -c "PATH=\"${MYSQL_BUILD_PATH:-/bin:/usr/bin}\" \ --infodir=/usr/info \ --includedir=/usr/include \ --mandir=/usr/man \ + --without-berkeley-db \ --with-comment=\"Official MySQL RPM\"; # Add this for more debugging support # --with-debug |