From: Franco Fichtner <franco@lastsummer.de>
Date: Mon, 27 Oct 2014 22:40:16 +0000 (+0100)
Subject: Merge branch 'vendor/MDOCML'
X-Git-Url: https://gitweb.dragonflybsd.org/~nant/dragonfly.git/commitdiff_plain/4c72d8f557bf94c0676d37b731068ffd94993d5c

Merge branch 'vendor/MDOCML'

Conflicts:
	contrib/mdocml/Makefile
	contrib/mdocml/mandoc.h
	contrib/mdocml/mdoc_validate.c
	contrib/mdocml/read.c
---

4c72d8f557bf94c0676d37b731068ffd94993d5c
diff --cc contrib/mdocml/Makefile
index c0248c9b7b,47f37a7dff..98179f315e
--- a/contrib/mdocml/Makefile
+++ b/contrib/mdocml/Makefile
@@@ -302,19 -380,18 +380,18 @@@ include Makefile.depen
  
  clean:
  	rm -f libmandoc.a $(LIBMANDOC_OBJS)
- 	rm -f mandocdb $(MANDOCDB_OBJS)
+ 	rm -f apropos $(APROPOS_OBJS)
+ 	rm -f makewhatis $(MAKEWHATIS_OBJS)
  	rm -f preconv $(PRECONV_OBJS)
- 	rm -f apropos whatis $(APROPOS_OBJS)
  	rm -f man.cgi $(CGI_OBJS)
- 	rm -f catman $(CATMAN_OBJS)
+ 	rm -f manpage $(MANPAGE_OBJS)
  	rm -f demandoc $(DEMANDOC_OBJS)
  	rm -f mandoc $(MANDOC_OBJS)
 -	rm -f config.h config.log $(COMPAT_OBJS)
 +	rm -f config.log $(COMPAT_OBJS)
- 	rm -f mdocml.tar.gz
- 	rm -f index.html $(INDEX_OBJS)
+ 	rm -f $(WWW_MANS) $(WWW_OBJS)
  	rm -rf *.dSYM
  
- install: all
+ base-install: base-build
  	mkdir -p $(DESTDIR)$(BINDIR)
  	mkdir -p $(DESTDIR)$(EXAMPLEDIR)
  	mkdir -p $(DESTDIR)$(LIBDIR)