From 42903aa6d5482af2377170017dd8d12c66cc1c2d Mon Sep 17 00:00:00 2001 From: "C. McEnroe" Date: Thu, 26 Aug 2021 16:22:38 -0400 Subject: Support DESTDIR in install/uninstall --- Makefile | 8 ++++---- system.mk | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 44bdf1c..9f4c5c7 100644 --- a/Makefile +++ b/Makefile @@ -28,15 +28,15 @@ clean: .endfor install: exman exman.1 - install -d ${PREFIX}/bin ${MANDIR}/man1 - install exman ${PREFIX}/bin - install -m 644 exman.1 ${MANDIR}/man1 + install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1 + install exman ${DESTDIR}${PREFIX}/bin + install -m 644 exman.1 ${DESTDIR}${MANDIR}/man1 .for system in ${SYSTEMS} ${MAKE} -C ${system} ${.TARGET} .endfor uninstall: - rm -f ${PREFIX}/bin/exman ${MANDIR}/man1/exman.1 + rm -f ${DESTDIR}${PREFIX}/bin/exman ${DESTDIR}${MANDIR}/man1/exman.1 .for system in ${SYSTEMS} ${MAKE} -C ${system} ${.TARGET} .endfor diff --git a/system.mk b/system.mk index 9a56c9d..4ed82be 100644 --- a/system.mk +++ b/system.mk @@ -17,11 +17,11 @@ clean: rm -f ${DISTFILES} install: ${DISTFILES} - install -d ${EXMANDIR}/${SYSTEM} + install -d ${DESTDIR}${EXMANDIR}/${SYSTEM} .for distfile in ${DISTFILES} - ${TAR} -x -f ${distfile} -C ${EXMANDIR}/${SYSTEM} \ + ${TAR} -x -f ${distfile} -C ${DESTDIR}${EXMANDIR}/${SYSTEM} \ --strip-components=${STRIP} '${FILES}' || ${ALLOW_FAILURE} .endfor uninstall: - rm -fr ${EXMANDIR}/${SYSTEM} + rm -fr ${DESTDIR}${EXMANDIR}/${SYSTEM} -- cgit 1.4.1