summaryrefslogtreecommitdiff
path: root/Docs
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-11-04 02:17:11 +0100
committerunknown <kent@mysql.com>2005-11-04 02:17:11 +0100
commit233c6b797ff6c124ba52ae4562bf7e95f86ea301 (patch)
treec262a4298ddcdc1e1f99fba719003fc9894a837b /Docs
parent33bb96d9d2bbec5eac3944be4b1e631128733547 (diff)
parentb0701a5c3b3653082d69ee2429ba279adce2f53b (diff)
downloadmariadb-git-233c6b797ff6c124ba52ae4562bf7e95f86ea301.tar.gz
Merge
Makefile.am: Auto merged client/Makefile.am: Auto merged libmysql/Makefile.am: Auto merged libmysql_r/Makefile.am: Auto merged libmysqld/Makefile.am: Auto merged mysql-test/Makefile.am: Auto merged netware/Makefile.am: Auto merged support-files/Makefile.am: Auto merged
Diffstat (limited to 'Docs')
-rw-r--r--Docs/Makefile.am24
1 files changed, 14 insertions, 10 deletions
diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index b1f69381774..685eaeef7d1 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -18,11 +18,11 @@ noinst_SCRIPTS = Support/generate-text-files.pl
EXTRA_DIST = $(noinst_SCRIPTS) mysql.info INSTALL-BINARY
-all: txt_files
-
-txt_files: ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
+TXT_FILES= ../INSTALL-SOURCE ../INSTALL-WIN-SOURCE ../EXCEPTIONS-CLIENT \
INSTALL-BINARY ../support-files/MacOSX/ReadMe.txt
+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.
@@ -30,28 +30,32 @@ install-data-hook: mysql.info
$(mkinstalldirs) $(DESTDIR)$(infodir)
$(INSTALL_DATA) $(srcdir)/mysql.info $(DESTDIR)$(infodir)
-CLEAN_FILES: $(txt_files)
- touch $(txt_files)
+uninstall-local:
+ @RM@ -f $(DESTDIR)$(infodir)/mysql.info
+
+# This target is not used in builds, just for convinience
+CLEAN_FILES: $(TXT_FILES)
+ touch $(TXT_FILES)
GT = $(srcdir)/Support/generate-text-files.pl
../INSTALL-SOURCE: mysql.info $(GT)
- perl -w $(GT) mysql.info "installing-source" "windows-source-build" > $@
+ perl -w $(GT) $< "installing-source" "windows-source-build" > $@
../INSTALL-WIN-SOURCE: mysql.info $(GT)
- perl -w $(GT) mysql.info "windows-source-build" "post-installation" > $@
+ perl -w $(GT) $< "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)
- perl -w $(GT) mysql.info "installing-binary" "installing-source" > $@
+ perl -w $(GT) $< "installing-binary" "installing-source" > $@
../EXCEPTIONS-CLIENT: mysql.info $(GT)
- perl -w $(GT) mysql.info "mysql-floss-license-exception" "function-index" > $@
+ perl -w $(GT) $< "mysql-floss-license-exception" "function-index" > $@
../support-files/MacOSX/ReadMe.txt: mysql.info $(GT)
- perl -w $(GT) mysql.info "mac-os-x-installation" "netware-installation" > $@
+ perl -w $(GT) $< "mac-os-x-installation" "netware-installation" > $@
# Don't update the files from bitkeeper
%::SCCS/s.%