Without HAVE_ERR, don't try to include <err.h>, it probably isn't there.

[mandoc.git] / Makefile

diff --git a/Makefile b/Makefile
index ec9eec6080bb1bb171241488a5df9c5f940b173c..91caa006c5fff57309ee6564bd32d762e6ace4a9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.472 2015/11/05 17:47:51 schwarze Exp $
+# $Id: Makefile,v 1.476 2015/11/07 13:14:21 schwarze Exp $
 #
 # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
 # Copyright (c) 2011, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -28,6 +28,7 @@ TESTSRCS       = test-dirent-namlen.c \
                   test-mkdtemp.c \
                   test-mmap.c \
                   test-ohash.c \
+                  test-pledge.c \
                   test-progname.c \
                   test-reallocarray.c \
                   test-sqlite3.c \
@@ -52,6 +53,7 @@ SRCS           = att.c \
                   compat_isblank.c \
                   compat_mkdtemp.c \
                   compat_ohash.c \
+                  compat_progname.c \
                   compat_reallocarray.c \
                   compat_sqlite3_errstr.c \
                   compat_strcasestr.c \
@@ -211,6 +213,7 @@ COMPAT_OBJS  = compat_err.o \
                   compat_isblank.o \
                   compat_mkdtemp.o \
                   compat_ohash.o \
+                  compat_progname.o \
                   compat_reallocarray.o \
                   compat_sqlite3_errstr.o \
                   compat_strcasestr.o \
@@ -337,19 +340,20 @@ clean:
 
 base-install: base-build
        mkdir -p $(DESTDIR)$(BINDIR)
-       mkdir -p $(DESTDIR)$(EXAMPLEDIR)
        mkdir -p $(DESTDIR)$(LIBDIR)
        mkdir -p $(DESTDIR)$(INCLUDEDIR)
        mkdir -p $(DESTDIR)$(MANDIR)/man1
        mkdir -p $(DESTDIR)$(MANDIR)/man3
        mkdir -p $(DESTDIR)$(MANDIR)/man5
        mkdir -p $(DESTDIR)$(MANDIR)/man7
-       $(INSTALL_PROGRAM) mandoc demandoc soelim $(DESTDIR)$(BINDIR)
+       $(INSTALL_PROGRAM) mandoc demandoc $(DESTDIR)$(BINDIR)
+       $(INSTALL_PROGRAM) soelim $(DESTDIR)$(BINDIR)/$(BINM_SOELIM)
        ln -f $(DESTDIR)$(BINDIR)/mandoc $(DESTDIR)$(BINDIR)/$(BINM_MAN)
        $(INSTALL_LIB) libmandoc.a $(DESTDIR)$(LIBDIR)
        $(INSTALL_LIB) man.h mandoc.h mandoc_aux.h mdoc.h roff.h \
                $(DESTDIR)$(INCLUDEDIR)
-       $(INSTALL_MAN) mandoc.1 demandoc.1 soelim.1 $(DESTDIR)$(MANDIR)/man1
+       $(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) mandoc.3 mandoc_escape.3 mandoc_malloc.3 \
                mchars_alloc.3 tbl.3 $(DESTDIR)$(MANDIR)/man3