[BACK]Return to patch-Makefile CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / misc / moreutils / patches

File: [cvs.NetBSD.org] / pkgsrc / misc / moreutils / patches / patch-Makefile (download)

Revision 1.2, Thu Sep 7 08:18:44 2017 UTC (4 years, 4 months ago) by leot
Branch: MAIN
CVS Tags: pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3
Changes since 1.1: +10 -7 lines

Instead of (wrongly) use the SUBST framework just patch Makefile (that is
already patched!) introducing a MANDIR variable instead of hardcoding
`share/man' and pass PKGMANDIR via MAKE_ENV.

No PKGREVISION bump since it should fix the build on platforms where moreutils
was already broken.

Pointed out by Joyent's Darwin bulk build.

$NetBSD: patch-Makefile,v 1.2 2017/09/07 08:18:44 leot Exp $

- Instruct Makefile to properly handle also man pages and scripts via
  corresponding INSTALL_{MAN,SCRIPT} in a similar vein of INSTALL_BIN.
- Introduce MANDIR in order to ease the installation of man pages

--- Makefile.orig	2016-08-13 13:58:21.000000000 +0000
+++ Makefile
@@ -3,7 +3,10 @@ PERLSCRIPTS=vidir vipe ts combine zrun c
 MANS=sponge.1 vidir.1 vipe.1 isutf8.1 ts.1 combine.1 ifdata.1 ifne.1 pee.1 zrun.1 chronic.1 mispipe.1 lckdo.1 parallel.1 errno.1
 CFLAGS?=-O2 -g -Wall
 INSTALL_BIN?=install -s
+INSTALL_MAN?=install
+INSTALL_SCRIPT?=install
 PREFIX?=/usr
+MANDIR?=$(PREFIX)/man
 
 ifneq (,$(findstring CYGWIN,$(shell uname)))
 	DOCBOOKXSL?=/usr/share/sgml/docbook/xsl-stylesheets
@@ -25,10 +28,10 @@ isutf8: is_utf8/*.c is_utf8/*.h
 install:
 	mkdir -p $(DESTDIR)$(PREFIX)/bin
 	$(INSTALL_BIN) $(BINS) $(DESTDIR)$(PREFIX)/bin
-	install $(PERLSCRIPTS) $(DESTDIR)$(PREFIX)/bin
+	$(INSTALL_SCRIPT) $(PERLSCRIPTS) $(DESTDIR)$(PREFIX)/bin
 
-	mkdir -p $(DESTDIR)$(PREFIX)/share/man/man1
-	install $(MANS) $(DESTDIR)$(PREFIX)/share/man/man1
+	mkdir -p $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL_MAN) $(MANS) $(DESTDIR)$(MANDIR)/man1
 
 check: isutf8
 	./is_utf8/test.sh