first batch of -T markdown tests

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index c11fe465940f945855ddd6b4fbbca8e46a5cae98..c3df4c346975856047b7b482b44bf2837195cfdc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.504 2017/02/18 15:29:39 schwarze Exp $
+# $Id: Makefile,v 1.507 2017/03/04 16:36:29 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -104,6 +104,7 @@ SRCS                 = att.c \
                   mdoc_html.c \
                   mdoc_macro.c \
                   mdoc_man.c \
+                  mdoc_markdown.c \
                   mdoc_state.c \
                   mdoc_term.c \
                   mdoc_validate.c \
@@ -252,8 +253,6 @@ MANDOC_HTML_OBJS = eqn_html.o \
                   mdoc_html.o \
                   tbl_html.o
 
-MANDOC_MAN_OBJS  = mdoc_man.o
-
 MANDOC_TERM_OBJS = eqn_term.o \
                   man_term.o \
                   mdoc_term.o \
@@ -279,6 +278,8 @@ MAIN_OBJS    = $(MANDOC_HTML_OBJS) \
                   $(DBA_OBJS) \
                   main.o \
                   manpath.o \
+                  mdoc_man.o \
+                  mdoc_markdown.o \
                   out.o \
                   tag.o \
                   tree.o
@@ -388,17 +389,16 @@ base-install: mandoc demandoc soelim
        mkdir -p $(DESTDIR)$(MANDIR)/man8
        $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
        $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
-       $(LN) $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN)
-       $(LN) $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_APROPOS)
-       $(LN) $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_WHATIS)
-       $(LN) $(DESTDIR)$(BINDIR)/mandoc \
-               $(DESTDIR)$(SBINDIR)/$(BINM_MAKEWHATIS)
+       cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_MAN)
+       cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_APROPOS)
+       cd $(DESTDIR)$(BINDIR) && $(LN) mandoc $(BINM_WHATIS)
+       cd $(DESTDIR)$(SBINDIR) && \
+               $(LN) ${BIN_FROM_SBIN}/mandoc $(BINM_MAKEWHATIS)
        $(INSTALL_MAN) mandoc.1 demandoc.1 $(DESTDIR)$(MANDIR)/man1
        $(INSTALL_MAN) soelim.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_SOELIM).1
        $(INSTALL_MAN) man.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_MAN).1
        $(INSTALL_MAN) apropos.1 $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1
-       $(LN) $(DESTDIR)$(MANDIR)/man1/$(BINM_APROPOS).1 \
-               $(DESTDIR)$(MANDIR)/man1/$(BINM_WHATIS).1
+       cd $(DESTDIR)$(MANDIR)/man1 && $(LN) $(BINM_APROPOS).1 $(BINM_WHATIS).1
        $(INSTALL_MAN) man.conf.5 $(DESTDIR)$(MANDIR)/man5/$(MANM_MANCONF).5
        $(INSTALL_MAN) mandoc.db.5 $(DESTDIR)$(MANDIR)/man5
        $(INSTALL_MAN) man.7 $(DESTDIR)$(MANDIR)/man7/$(MANM_MAN).7
@@ -475,7 +475,7 @@ uninstall:
        rm -f $(DESTDIR)$(INCLUDEDIR)/mandoc_aux.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/mdoc.h
        rm -f $(DESTDIR)$(INCLUDEDIR)/roff.h
-       rmdir $(DESTDIR)$(INCLUDEDIR)
+       [ ! -e $(DESTDIR)$(INCLUDEDIR) ] || rmdir $(DESTDIR)$(INCLUDEDIR)
 
 regress: all
        cd regress && ./regress.pl