aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-12-09 06:31:03 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-12-09 06:31:03 +0000
commit5e529b3ef661c651290a0c87c7544789db7994f6 (patch)
tree95aeb40764d0490f62f38da7aabfa23379a4828d
parent85d083e2a401e3d3553c4fcf38bc617767765d9a (diff)
downloadmandoc-5e529b3ef661c651290a0c87c7544789db7994f6.tar.gz
mandoc-5e529b3ef661c651290a0c87c7544789db7994f6.tar.zst
mandoc-5e529b3ef661c651290a0c87c7544789db7994f6.zip
Some sorting and some more comments.
Drop DISTDIR from www-install target.
-rw-r--r--Makefile47
1 files changed, 28 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index 3d2d2220..632c7a9d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.450 2014/12/09 06:11:35 schwarze Exp $
+# $Id: Makefile,v 1.451 2014/12/09 06:31:03 schwarze Exp $
#
# Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
# Copyright (c) 2011, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -15,6 +15,8 @@
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+# === LIST OF FILES ====================================================
+
TESTSRCS = test-dirent-namlen.c \
test-fgetln.c \
test-fts.c \
@@ -259,6 +261,8 @@ WWW_MANS = apropos.1.html \
WWW_OBJS = mdocml.tar.gz \
mdocml.sha256
+# === USER CONFIGURATION ===============================================
+
include Makefile.local
INSTALL_TARGETS = $(BUILD_TARGETS:-build=-install)
@@ -279,6 +283,9 @@ www: $(WWW_OBJS) $(WWW_MANS)
$(WWW_MANS): mandoc
+.PHONY: base-install cgi-install db-install install www-install
+.PHONY: clean distclean depend
+
include Makefile.depend
# === TARGETS CONTAINING SHELL COMMANDS ================================
@@ -344,26 +351,10 @@ cgi-install: cgi-build
$(INSTALL_MAN) apropos.1 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man1/
$(INSTALL_MAN) man.cgi.8 $(DESTDIR)$(WWWPREFIX)/man/mandoc/man8/
-www-install: www
- mkdir -p $(DESTDIR)$(HTDOCDIR)/snapshots
- $(INSTALL_DATA) $(WWW_MANS) style.css $(DESTDIR)$(HTDOCDIR)
- $(INSTALL_DATA) $(WWW_OBJS) $(DESTDIR)$(HTDOCDIR)/snapshots
- $(INSTALL_DATA) mdocml.tar.gz \
- $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
- $(INSTALL_DATA) mdocml.sha256 \
- $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256
-
Makefile.local config.h: configure ${TESTSRCS}
@echo "$@ is out of date; please run ./configure"
@exit 1
-depend: config.h
- mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
- perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
- s|\\\n||g; s| +| |g; s| $$||mg; print;' \
- Makefile.depend > Makefile.tmp
- mv Makefile.tmp Makefile.depend
-
libmandoc.a: $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
$(AR) rs $@ $(COMPAT_OBJS) $(LIBMANDOC_OBJS)
@@ -382,6 +373,24 @@ man.cgi: $(CGI_OBJS) libmandoc.a
demandoc: $(DEMANDOC_OBJS) libmandoc.a
$(CC) $(LDFLAGS) -o $@ $(DEMANDOC_OBJS) libmandoc.a
+# --- maintainer targets ---
+
+www-install: www
+ mkdir -p $(HTDOCDIR)/snapshots
+ $(INSTALL_DATA) $(WWW_MANS) style.css $(HTDOCDIR)
+ $(INSTALL_DATA) $(WWW_OBJS) $(HTDOCDIR)/snapshots
+ $(INSTALL_DATA) mdocml.tar.gz \
+ $(HTDOCDIR)/snapshots/mdocml-$(VERSION).tar.gz
+ $(INSTALL_DATA) mdocml.sha256 \
+ $(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256
+
+depend: config.h
+ mkdep -f Makefile.depend $(CFLAGS) $(SRCS)
+ perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \
+ s|\\\n||g; s| +| |g; s| $$||mg; print;' \
+ Makefile.depend > Makefile.tmp
+ mv Makefile.tmp Makefile.depend
+
mdocml.sha256: mdocml.tar.gz
sha256 mdocml.tar.gz > $@
@@ -392,8 +401,8 @@ mdocml.tar.gz: $(DISTFILES)
( cd .dist/ && tar zcf ../$@ mdocml-$(VERSION) )
rm -rf .dist/
-.PHONY: base-install cgi-install db-install install www-install
-.PHONY: clean distclean depend
+# === SUFFIX RULES =====================================================
+
.SUFFIXES: .1 .3 .5 .7 .8 .h
.SUFFIXES: .1.html .3.html .5.html .7.html .8.html .h.html