Fix makefiles for installing via ports

diff --git a/Makefile b/Makefile
index 719a9e8c0772b2771be7be0aaf8b44d16f964a79..7d25f19a482c965be8f177fcd2ee12d91cecee61 100644 (file)
--- 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 146675d71878510bf7a24fb35d386e4cc2850251..1d3669da5a6a5c00f506cce6b81b7abeb138a6eb 100644 (file)
--- 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 98e1759c82465efa3962b11bc819a3c9c641f791..5d9bf261849150c5552a4cece80d8e4f06f14d3c 100644 (file)
--- 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 8436cf3fe434f7fdc96bceb9cd6408a3cdc401e4..9fdb9d8a8bdf63f1732d8398173eff874a22e8cc 100644 (file)
--- 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