pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

i3lock: Improve man-page handling in the original Makefile



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Jun 12 00:40:40 2016 +0200
Changeset:	593d7c8b3d6d13767ea20a58a5320f566212db23

Modified Files:
	i3lock/Makefile
	i3lock/distinfo
	i3lock/patches/patch-Makefile

Log Message:
i3lock: Improve man-page handling in the original Makefile

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=593d7c8b3d6d13767ea20a58a5320f566212db23

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 i3lock/Makefile               |  6 +-----
 i3lock/distinfo               |  2 +-
 i3lock/patches/patch-Makefile | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 7 deletions(-)

diffs:
diff --git a/i3lock/Makefile b/i3lock/Makefile
index 022d1e6..bc2a02d 100644
--- a/i3lock/Makefile
+++ b/i3lock/Makefile
@@ -17,14 +17,10 @@ USE_LANGUAGES=	c99
 MAKE_FLAGS+=	PREFIX=${PREFIX}
 MAKE_FLAGS+=	SYSCONFDIR=${PKG_SYSCONFDIR}
 MAKE_FLAGS+=	EGDIR=${EGDIR}
-
-INSTALLATION_DIRS=	${PKGMANDIR}/man1
+MAKE_FLAGS+=	MANDIR=${PKGMANDIR}
 
 EGDIR=	${PREFIX}/share/examples/${PKGBASE}
 
-post-install:
-	cd ${WRKSRC} && ${INSTALL_MAN} i3lock.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
-
 .include "../../devel/libev/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../x11/libxcb/buildlink3.mk"
diff --git a/i3lock/distinfo b/i3lock/distinfo
index 739293c..79107a8 100644
--- a/i3lock/distinfo
+++ b/i3lock/distinfo
@@ -4,4 +4,4 @@ SHA1 (i3lock-2.7.tar.bz2) = d1096b1f67bfcddc447fade8fa4f7bc124607fec
 RMD160 (i3lock-2.7.tar.bz2) = b140a1babea730469943641d5d78655d9a5807a8
 SHA512 (i3lock-2.7.tar.bz2) = 7945d142d239fe7f8985c1000e22db0532456939e65ee855f12e364092808d0cc09cc818b1189e32d88c872ce00033c41c8ebefe62349630872815adaf8b3899
 Size (i3lock-2.7.tar.bz2) = 19490 bytes
-SHA1 (patch-Makefile) = e5b2f325294ed3148eab4be0ee32996d6eb85758
+SHA1 (patch-Makefile) = 20653b964ce099c0b9daba433a07d2b5b0f1bac3
diff --git a/i3lock/patches/patch-Makefile b/i3lock/patches/patch-Makefile
index a01dcd9..cc7a3d0 100644
--- a/i3lock/patches/patch-Makefile
+++ b/i3lock/patches/patch-Makefile
@@ -1,18 +1,29 @@
 $NetBSD$
 
 Install example configuration into EGDIR.
+Install man-page.
 
 --- Makefile.orig	2015-05-20 07:17:06.000000000 +0000
 +++ Makefile
-@@ -37,9 +37,9 @@ clean:
+@@ -2,6 +2,7 @@ INSTALL=install
+ PREFIX=/usr
+ SYSCONFDIR=/etc
+ PKG_CONFIG=pkg-config
++MANDIR=share/man
+ 
+ # Check if pkg-config is installed, we need it for building CFLAGS/LIBS
+ ifeq ($(shell which $(PKG_CONFIG) 2>/dev/null 1>/dev/null || echo 1),1)
+@@ -37,9 +38,11 @@ clean:
  
  install: all
  	$(INSTALL) -d $(DESTDIR)$(PREFIX)/bin
 -	$(INSTALL) -d $(DESTDIR)$(SYSCONFDIR)/pam.d
 +	$(INSTALL) -d $(DESTDIR)$(EGDIR)/pam.d
++	$(INSTALL) -d $(DESTDIR)$(PREFIX)/$(MANDIR)/man1
  	$(INSTALL) -m 755 i3lock $(DESTDIR)$(PREFIX)/bin/i3lock
 -	$(INSTALL) -m 644 i3lock.pam $(DESTDIR)$(SYSCONFDIR)/pam.d/i3lock
 +	$(INSTALL) -m 644 i3lock.pam $(DESTDIR)$(EGDIR)/pam.d/i3lock
++	$(INSTALL) -m 644 i3lock.1 $(DESTDIR)$(PREFIX)/$(MANDIR)/man1/i3lock.1
  
  uninstall:
  	rm -f $(DESTDIR)$(PREFIX)/bin/i3lock


Home | Main Index | Thread Index | Old Index