Mercurial > hg > dhcpcd

changeset 268:f34434d4afdb draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix makefiles for installing via ports
author Roy Marples <roy@marples.name>
date Tue, 08 Jan 2008 10:51:03 +0000
parents ef86abf3fda1
children 32fa4f09a26d
files Makefile mk/dist.mk mk/man.mk mk/prog.mk
diffstat 4 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue Jan 08 10:22:57 2008 +0000
+++ b/Makefile	Tue Jan 08 10:51:03 2008 +0000
@@ -10,7 +10,7 @@
 VERSION=	3.1.8
 CLEANFILES=	version.h dhcpcd.8
 
-BINDIR=		/sbin
+BINDIR=		${PREFIX}/sbin
 
 # Needed for crappy Linux headers :/
 CSTD=		gnu99
--- a/mk/dist.mk	Tue Jan 08 10:22:57 2008 +0000
+++ b/mk/dist.mk	Tue Jan 08 10:51:03 2008 +0000
@@ -2,9 +2,10 @@
 # Copyright 2008 Roy Marples <roy@marples.name>
 
 GITREF?=	HEAD
-DISTFILE?=	${PROG}-${VERSION}.tar.bz2
+DISTPREFIX?=	${PROG}-${VERSION}
+DISTFILE?=	${DISTPREFIX}.tar.bz2
 
 CLEANFILES+=	${DISTFILE}
 
 dist:
-	git archive ${GITREF} | bzip2 > ${DISTFILE}
+	git archive --prefix=${DISTPREFIX}/ ${GITREF} | bzip2 > ${DISTFILE}
--- a/mk/man.mk	Tue Jan 08 10:22:57 2008 +0000
+++ b/mk/man.mk	Tue Jan 08 10:51:03 2008 +0000
@@ -1,8 +1,8 @@
 # rules to install manpages
 # Copyright 2008 Roy Marples <roy@marples.name>
 
-SHAREDIR?=	/usr/share
-MANDIR?=	${SHAREDIR}/man/man
+MANPREFIX?=	/usr/share
+MANDIR?=	${MANPREFIX}/man/man
 MANMODE?=	0444
 MINSTALL?=	${INSTALL} -m ${MANMODE}
 
--- a/mk/prog.mk	Tue Jan 08 10:22:57 2008 +0000
+++ b/mk/prog.mk	Tue Jan 08 10:51:03 2008 +0000
@@ -3,7 +3,7 @@
 
 # Copyright 2008 Roy Marples <roy@marples.name>
 
-BINDIR?=	/sbin
+BINDIR?=	${PREFIX}/usr/bin
 OBJS+=		${SRCS:.c=.o}
 
 INSTALL?=	install