From: Roy Marples <roy@marples.name>
Date: Tue, 8 Jan 2008 10:51:03 +0000 (+0000)
Subject: Fix makefiles for installing via ports
X-Git-Tag: v3.2.3~106
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4928928e14c7ddf3751e3e01c45c42e04da91b7b;p=thirdparty%2Fdhcpcd.git

Fix makefiles for installing via ports
---

diff --git a/Makefile b/Makefile
index 719a9e8c..7d25f19a 100644
--- a/Makefile
+++ b/Makefile
@@ -10,7 +10,7 @@ MAN=		dhcpcd.8
 VERSION=	3.1.8
 CLEANFILES=	version.h dhcpcd.8
 
-BINDIR=		/sbin
+BINDIR=		${PREFIX}/sbin
 
 # Needed for crappy Linux headers :/
 CSTD=		gnu99
diff --git a/mk/dist.mk b/mk/dist.mk
index 146675d7..1d3669da 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -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}
diff --git a/mk/man.mk b/mk/man.mk
index 98e1759c..5d9bf261 100644
--- a/mk/man.mk
+++ b/mk/man.mk
@@ -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}
 
diff --git a/mk/prog.mk b/mk/prog.mk
index 8436cf3f..9fdb9d8a 100644
--- a/mk/prog.mk
+++ b/mk/prog.mk
@@ -3,7 +3,7 @@
 
 # Copyright 2008 Roy Marples <roy@marples.name>
 
-BINDIR?=	/sbin
+BINDIR?=	${PREFIX}/usr/bin
 OBJS+=		${SRCS:.c=.o}
 
 INSTALL?=	install