[Emms-patches] [COMMIT] Some more changes.

[Tim Landscheidt]

---
 Makefile |   10 +++++-----
 README   |   11 ++++-------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 971da3f..c3fe8f2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GZIP=gzip
 MAN1PAGES=emms-print-metadata.1
-DOCDIR=doc/
+DOCDIR=doc
 LISPDIR=lisp
 SRCDIR=src
 
@@ -12,7 +12,7 @@ INFODIR=$(PREFIX)/info
 MAN1DIR=$(PREFIX)/share/man/man1
 SITELISP=$(PREFIX)/share/emacs/site-lisp/emms
 
-INSTALLINFO = /usr/sbin/install-info --info-dir=$(INFODIR)
+INSTALLINFO = /sbin/install-info --info-dir=$(INFODIR)
 
 # The currently released version of EMMS
 VERSION=3.0
@@ -38,9 +38,9 @@ install:
        test -d $(INFODIR) || install -d $(INFODIR)
        install -m 644 $(ALLSOURCE) $(SITELISP)
        install -m 644 $(ALLCOMPILED) $(SITELISP)
-       install -m 0644 $(DOCDIR)emms.info $(INFODIR)/emms
+       test -d $(MAN1DIR) || install -d $(MAN1DIR)
        for p in $(MAN1PAGES) ; do $(GZIP) -9c $$p > $(MAN1DIR)/$$p.gz ; done
-       $(INSTALLINFO) emms.info
+       $(INSTALLINFO) $(DOCDIR)/emms.info
 
 remove-info:
        $(INSTALLINFO) --remove emms.info
@@ -52,7 +52,7 @@ ChangeLog:
        darcs changes > $@
 
 clean:
-       -rm -f *~ $(DOCDIR)emms.info $(DOCDIR)emms.html emms-print-metadata
+       -rm -f *~ $(DOCDIR)/emms.info $(DOCDIR)/emms.html emms-print-metadata
        $(MAKE) -C $(LISPDIR) clean
 
 dist: autoloads clean
diff --git a/README b/README
index 16110c8..0660322 100644
--- a/README
+++ b/README
@@ -156,13 +156,10 @@ Seeking works through the following functions :
 ===============================
 
 There is a way to read tags using Libtag as your backend for
-emms-info. However, since it requires a binary file (source code
-provided with EMMS), it isn't enabled by default. To compile it, type
-"make emms-print-metadata". To install it, either put
-emms-print-metadata in your $PATH, or add emms directory to Emacs'
-exec-path. Since, libtag overwrites most of the usual methods for
-providing info, it's best to keep it as the only function in
-`emms-info-functions'. Here's a way to do so:
+emms-info. However, since libtag overwrites most of the
+usual methods for providing info, it's best to keep it as
+the only function in `emms-info-functions'. Here's a way to
+do so:
 
 (require 'emms-info-libtag)
 (setq emms-info-functions '(emms-info-libtag))
-- 
debian.1.5.6.1.19.ge6b2