From d3e1a8b4cfd100f8d7830b2a7904aa545cc62c17 Mon Sep 17 00:00:00 2001 From: Dirk Meyer Date: Sat, 11 Dec 2010 05:20:42 +0000 Subject: [PATCH] - fix build with NOPORTDOCS Reported by: QAT --- irc/ngircd/Makefile | 10 +--------- irc/ngircd/files/patch-doc-Makefile.in | 16 +++++++++++++--- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/irc/ngircd/Makefile b/irc/ngircd/Makefile index cb3441b09e1c..3b299d313e44 100644 --- a/irc/ngircd/Makefile +++ b/irc/ngircd/Makefile @@ -82,15 +82,7 @@ CONFIGURE_ARGS+= --enable-debug .endif .if defined(NOPORTDOCS) -post-patch: - ${REINPLACE_CMD} -e 's|SUBDIRS = doc src|SUBDIRS = src|' \ - ${WRKSRC}/Makefile.in -.endif - -.if !defined(NOPORTDOCS) -post-install: - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} +MAKE_ARGS+= NOPORTDOCS=yes .endif .include diff --git a/irc/ngircd/files/patch-doc-Makefile.in b/irc/ngircd/files/patch-doc-Makefile.in index ae6d43854be2..6c71c4695abf 100644 --- a/irc/ngircd/files/patch-doc-Makefile.in +++ b/irc/ngircd/files/patch-doc-Makefile.in @@ -1,11 +1,21 @@ ---- doc/Makefile.in.orig 2010-12-07 12:16:28.085145000 -0800 -+++ doc/Makefile.in 2010-12-07 12:30:19.023013888 -0800 -@@ -505,7 +505,7 @@ +--- doc/Makefile.in.orig 2010-11-07 17:25:30.000000000 +0100 ++++ doc/Makefile.in 2010-12-11 06:14:18.000000000 +0100 +@@ -505,8 +505,9 @@ install-data-hook: $(static_docs) $(toplevel_docs) $(generated_docs) $(mkinstalldirs) $(DESTDIR)$(sysconfdir) if [ ! -f $(DESTDIR)$(sysconfdir)/ngircd.conf ]; then \ - $(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf; \ + $(INSTALL) -m 600 -c sample-ngircd.conf $(DESTDIR)$(sysconfdir)/ngircd.conf.sample; \ fi ++.if !defined(NOPORTDOCS) $(mkinstalldirs) $(DESTDIR)$(docdir) for f in $(static_docs) $(toplevel_docs); do \ + $(INSTALL) -m 644 -c $(srcdir)/$$f $(DESTDIR)$(docdir)/; \ +@@ -514,6 +515,7 @@ + for f in $(generated_docs); do \ + $(INSTALL) -m 644 -c $$f $(DESTDIR)$(docdir)/; \ + done ++.endif + + uninstall-hook: + rm -rf $(DESTDIR)$(docdir)