From b323bcd6637343775f3dca3df89bf889e938fd04 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Tue, 5 Aug 2014 11:19:46 +0000 Subject: merge portability fix from HEAD --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3ea1c7cb..d69eaa58 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.395.2.25 2014/08/05 05:51:33 schwarze Exp $ +# $Id: Makefile,v 1.395.2.26 2014/08/05 11:19:46 schwarze Exp $ # # Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons # Copyright (c) 2011, 2013, 2014 Ingo Schwarze @@ -314,7 +314,7 @@ install: base-install $(INSTALL_TARGETS) www: $(WWW_OBJS) $(WWW_MANS) -.include "Makefile.depend" +include Makefile.depend # === TARGETS CONTAINING SHELL COMMANDS ================================ @@ -366,7 +366,7 @@ www-install: www $(INSTALL_DATA) mdocml.sha256 \ $(DESTDIR)$(HTDOCDIR)/snapshots/mdocml-$(VERSION).sha256 -Makefile.depend: $(SRCS) config.h Makefile +depend: config.h mkdep -f Makefile.depend $(CFLAGS) $(SRCS) perl -e 'undef $$/; $$_ = <>; s|/usr/include/\S+||g; \ s|\\\n||g; s| +| |g; print;' Makefile.depend > Makefile.tmp @@ -404,7 +404,8 @@ config.h: configure config.h.pre config.h.post $(TESTSRCS) rm -f config.log CC="$(CC)" CFLAGS="$(CFLAGS)" VERSION="$(VERSION)" ./configure -.PHONY: base-install clean db-install install www-install +.PHONY: base-install db-install install www-install +.PHONY: clean depend .SUFFIXES: .1 .3 .5 .7 .8 .h .SUFFIXES: .1.html .3.html .5.html .7.html .8.html .h.html -- cgit v1.2.3-56-ge451