diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-28 18:07:50 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-28 18:07:50 +0100 |
| commit | 4d08b747f9fa3521c63b21d990066a71390bd175 (patch) | |
| tree | 75cc9800ac76febcf931e27d5257b74b162ff31c /Docs | |
| parent | 344db8ab5d32ea0ecdd07be6b9f23ca1133dcd25 (diff) | |
| parent | 0fb7649940c849f4df4ceca7d01f5e8946ffbb0d (diff) | |
| download | mariadb-git-4d08b747f9fa3521c63b21d990066a71390bd175.tar.gz | |
Merge mysql.com:/home/kent/bk/mysql-4.1-build
into mysql.com:/home/kent/bk/mysql-5.0-build
Docs/Makefile.am:
Auto merged
Diffstat (limited to 'Docs')
| -rw-r--r-- | Docs/Makefile.am | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am index 66e77ae7d7c..ad78a30118e 100644 --- a/Docs/Makefile.am +++ b/Docs/Makefile.am @@ -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 |