diff --git a/Makefile b/Makefile index f56eabd..31f34aa 100644 --- a/Makefile +++ b/Makefile @@ -2,10 +2,6 @@ SUBDIR= src man -PREFIX?=${LOCALBASE}/usr/sbin/ -BINDIR?=${PREFIX} - -MANDIR=${LOCALBASE}/usr/share/man/man8 -MAN=${DAEMON_NAME}.8 +MAN?=${DAEMON_NAME}.8 .include diff --git a/man/Makefile b/man/Makefile index 3d37559..3dc0a1a 100644 --- a/man/Makefile +++ b/man/Makefile @@ -1,12 +1,12 @@ .include<../mkinfo.mk> realinstall: - cp ${DAEMON_NAME}.8 ${MANDIR}/${DAEMON_NAME}.8 + cp ${DAEMON_NAME}.8 ${MANDIR}${DAEMON_NAME}.8 makewhatis ${LOCALBASE}/usr/share/man clean: - rm ${MANDIR}/${DAEMON_NAME}.8 - makewhatis ${LOCALBASE}/${MANDIR} + rm ${MANDIR}${DAEMON_NAME}.8 + makewhatis ${LOCALBASE}${MANDIR} .include .include diff --git a/mkinfo.mk b/mkinfo.mk index 5905a57..ede16c6 100644 --- a/mkinfo.mk +++ b/mkinfo.mk @@ -1,14 +1,16 @@ NAME= macrandr DAEMON_NAME=${NAME}d -MAINTAINER= Giacomo Picchiarelli -COMMENT= A daemon to change periodically MAC addresses V= 0.1.0 PKGNAME= ${DAEMON_NAME}-${V} DISTNAME= ${DAEMON_NAME}.${V} + LOCAL_DAEMON_FILE= /etc/rc.conf.local -HOMEPAGE= https://github.com/gpicchiarelli/${NAME} -MASTER_SITE= https://github.com/gpicchiarelli/${NAME} + +PREFIX=${LOCALBASE}/usr +BINDIR=${PREFIX}/sbin/ + +MANDIR=${LOCALBASE}${PREFIX}/share/man/man8/ CFLAGS+= -fstack-protector-all CFLAGS+= -Wunused-variable diff --git a/src/Makefile b/src/Makefile index 1cac95d..0efefe5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -16,9 +16,9 @@ ${NAME}.o: ${NAME}.c realinstall: all cp ${DAEMON_NAME} ${LOCALBASE}/etc/rc.d/${DAEMON_NAME} - cp ${NAME} ${LOCALBASE}/usr/sbin/${NAME} + cp ${NAME} ${LOCALBASE}${BINDIR}${NAME} chmod 0555 ${LOCALBASE}/etc/rc.d/${DAEMON_NAME} - chmod 0555 ${LOCALBASE}/usr/sbin/${NAME} + chmod 0555 ${LOCALBASE}${BINDIR}${NAME} rcctl enable ${DAEMON_NAME} rcctl start ${DAEMON_NAME} @@ -29,6 +29,6 @@ clean: rcctl stop ${DAEMON_NAME} rcctl disable ${DAEMON_NAME} rm ${LOCALBASE}/etc/rc.d/${DAEMON_NAME} - rm ${LOCALBASE}/usr/sbin/${NAME} + rm ${LOCALBASE}${BINDIR}${NAME} .include