summaryrefslogtreecommitdiff
path: root/Docs
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2006-11-29 14:35:59 +0100
committerkent@kent-amd64.(none) <>2006-11-29 14:35:59 +0100
commit3749d77c8ce17af599d046daf7642fafd81080be (patch)
tree460a3e6c541e0c305229d8f116e11537cf6748d3 /Docs
parent65183d54d2aaa7794b4f5f924f7043d7757ee951 (diff)
parentb67ff612d3d17d6806d1f85f2c4b7b5c6d1e3800 (diff)
downloadmariadb-git-3749d77c8ce17af599d046daf7642fafd81080be.tar.gz
Merge mysql.com:/home/kent/bk/mysql-5.0-build
into mysql.com:/home/kent/bk/mysql-5.1-build
Diffstat (limited to 'Docs')
-rw-r--r--Docs/Makefile.am12
1 files changed, 6 insertions, 6 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 9ff8df52215..4ab92bc557f 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)/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" > $@
# Include the Windows manual.chm in source .tar.gz only if available.