[PATCH] Also handle CVS branches with a '/' in their name

diff --git a/Documentation/Makefile b/Documentation/Makefile
index e3844f213bdf39446e7b083684116141f41e573f..336578497d3b55163194dc62a0f01121fbed9276 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -6,6 +6,15 @@ DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
 DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT))
 DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
 
+prefix=$(HOME)
+bin=$(prefix)/bin
+mandir=$(prefix)/man
+man1=$(mandir)/man1
+man7=$(mandir)/man7
+# DESTDIR=
+
+INSTALL=install
+
 #
 # Please note that there is a minor bug in asciidoc.
 # The version after 6.0.3 _will_ include the patch found here:
@@ -24,18 +33,24 @@ man: man1 man7
 man1: $(DOC_MAN1)
 man7: $(DOC_MAN7)
 
+install:
+       $(INSTALL) -m755 -d $(DESTDIR)/$(man1) $(DESTDIR)/$(man7)
+       $(INSTALL) $(DOC_MAN1) $(DESTDIR)/$(man1)
+       $(INSTALL) $(DOC_MAN7) $(DESTDIR)/$(man7)
+
 # 'include' dependencies
-git-diff-%.txt: diff-format.txt
+git-diff-%.txt: diff-format.txt diff-options.txt
        touch $@
 
 clean:
        rm -f *.xml *.html *.1 *.7
 
 %.html : %.txt
-       asciidoc -b css-embedded -d manpage $<
+       asciidoc -b xhtml11 -d manpage $<
 
 %.1 %.7 : %.xml
        xmlto man $<
 
 %.xml : %.txt
        asciidoc -b docbook -d manpage $<
+