about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2021-08-26 16:22:38 -0400
committerJune McEnroe <june@causal.agency>2021-08-26 16:22:38 -0400
commit42903aa6d5482af2377170017dd8d12c66cc1c2d (patch)
treef432d645f62e3fdaf2ea6891e03c0543e9ac6198
parentAdd version number generator (diff)
downloadexman-42903aa6d5482af2377170017dd8d12c66cc1c2d.tar.gz
exman-42903aa6d5482af2377170017dd8d12c66cc1c2d.zip
Support DESTDIR in install/uninstall
Diffstat (limited to '')
-rw-r--r--Makefile8
-rw-r--r--system.mk6
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}
-23 21:39:49 -0400'>2021-09-23Add quickJune McEnroe 2021-09-23Add The HobbitJune McEnroe Surprisingly good for something written by a man like a hundred years ago! 2021-09-22Remove PSF fontsJune McEnroe They were fun to make but I never actually used them. 2021-09-22Remove Linux-specific utilitiesJune McEnroe I haven't used these in ages. 2021-09-22Call sandbox in CGI modeJune McEnroe Otherwise upload won't actually work. 2021-09-22Support HTTP PUT in upJune McEnroe For use by Palaver[1]. Unfortunately, at least in the current App Store version of Palaver, this doesn't work correctly with basic auth. [1]: https://palaverapp.com/guides/commands/set.html#ui-image_service 2021-09-22Remove default faviconJune McEnroe I hate these things and also this one sucks. 2021-09-21Use Z_FILTERED strategyJune McEnroe 2021-09-21Recalculate various lengths only as neededJune McEnroe This actually speeds things up quite a bit, saving roughly a second on a big PNG screenshot. Almost all the remaining time is spent in deflate. 2021-09-21Rewrite pngo, add explicit optionsJune McEnroe Interesting to see how my code habits have changed. 2021-09-16Fix /* **/ comment matchingJune McEnroe 2021-09-15Remove typer, add downgrade to READMEJune McEnroe 2021-09-15Set bot mode on downgradeJune McEnroe 2021-09-15Enter capsicum in downgradeJune McEnroe 2021-09-15Factor out common parts of downgrade messagesJune McEnroe Also bump the message cap to 1024 because that is ostensibly useful for replying to older messages. 2021-09-14Add downgrade IRC botJune McEnroe 2021-09-14Sort by title if authors matchJune McEnroe There are probably better things to sort by but title definitely always exists. 2021-09-13Swap-remove tags as they're foundJune McEnroe This makes it even faster. From ~1s on a sqlite3.c amalgamation to ~0.85s. 2021-09-12Replace htagml regex with strncmpJune McEnroe Since ctags only ever produces regular expressions of the form /^re$/ or /^re/ with no other special characters, instead unescape the pattern and simply use strncmp. Running on a sqlite3.c amalgamation, the regex version takes ~37s while the strncmp version takes ~1s, producing identical output. Big win! 2021-09-11Also defer printing comment for lone close-parensJune McEnroe 2021-09-10Publish "git-comment"June McEnroe 2021-09-10Add git comment --pretty optionJune McEnroe 2021-09-08Defer printing comment if line is blank or closing braceJune McEnroe This fixes badly indented comments. 2021-09-08Up default min-repeat to 30 linesJune McEnroe 2021-09-08Handle dirty lines in git-commentJune McEnroe 2021-09-08Document and install git-commentJune McEnroe 2021-09-08Add repeat and all options to git-commentJune McEnroe 2021-09-08Add group threshold to git-commentJune McEnroe