summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-05-23 14:12:07 -0400
committerJune McEnroe <june@causal.agency>2020-05-23 19:14:47 -0400
commitfd679bbca8ad24c0ddd69e3d2018fbbe4bb8e54d (patch)
tree1d61e17c85746106154fc37c18e2ab29014d8162 /Makefile
parentRevert "Send blank line after 10 minutes idle" (diff)
downloadcatgirl-fd679bbca8ad24c0ddd69e3d2018fbbe4bb8e54d.tar.gz
catgirl-fd679bbca8ad24c0ddd69e3d2018fbbe4bb8e54d.zip
Don't compress man page or use configure on FreeBSD
Also use DESTDIR in install.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile23
1 files changed, 13 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 68e673b..f5c9854 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,12 @@
 PREFIX = /usr/local
 MANDIR = ${PREFIX}/share/man
 
+CFLAGS += -I${PREFIX}/include
+LDFLAGS += -L${PREFIX}/lib
+
 CEXTS = gnu-case-range gnu-conditional-omitted-operand
 CFLAGS += -std=c11 -Wall -Wextra -Wpedantic ${CEXTS:%=-Wno-%}
-LDLIBS = -lcrypto -ltls -lncursesw
+LDLIBS = -lncursesw -ltls
 
 -include config.mk
 
@@ -36,23 +39,23 @@ clean:
 	rm -f tags catgirl ${OBJS}
 
 install: catgirl catgirl.1
-	install -d ${PREFIX}/bin ${MANDIR}/man1
-	install catgirl ${PREFIX}/bin
-	gzip -c catgirl.1 > ${MANDIR}/man1/catgirl.1.gz
+	install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1
+	install catgirl ${DESTDIR}${PREFIX}/bin
+	install -m 644 catgirl.1 ${DESTDIR}${MANDIR}/man1
 
 uninstall:
-	rm -f ${PREFIX}/bin/catgirl ${MANDIR}/man1/catgirl.1.gz
+	rm -f ${DESTDIR}${PREFIX}/bin/catgirl ${DESTDIR}${MANDIR}/man1/catgirl.1
 
 scripts/sandman: scripts/sandman.o
 	${CC} ${LDFLAGS} scripts/sandman.o -framework Cocoa -o $@
 
 install-sandman: scripts/sandman scripts/sandman.1
-	install -d ${PREFIX}/bin ${MANDIR}/man1
-	install scripts/sandman ${PREFIX}/bin
-	gzip -c scripts/sandman.1 > ${MANDIR}/man1/sandman.1.gz
+	install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1
+	install scripts/sandman ${DESTDIR}${PREFIX}/bin
+	install -m 644 scripts/sandman.1 ${DESTDIR}${MANDIR}/man1
 
 uninstall-sandman:
-	rm -f ${PREFIX}/bin/sandman ${MANDIR}/man1/sandman.1.gz
+	rm -f ${DESTDIR}${PREFIX}/bin/sandman ${DESTDIR}${MANDIR}/man1/sandman.1
 
 CHROOT_USER = chat
 CHROOT_GROUP = ${CHROOT_USER}
@@ -87,7 +90,7 @@ chroot.tar: catgirl catgirl.1 scripts/chroot-prompt.sh scripts/chroot-man.sh
 	cp -af /usr/share/locale root/usr/share
 	cp -fp /usr/share/misc/termcap.db root/usr/share/misc
 	cp -fp /rescue/sh /usr/bin/mandoc /usr/bin/less root/bin
-	${MAKE} install PREFIX=root/usr
+	${MAKE} install DESTDIR=root PREFIX=/usr
 	install scripts/chroot-prompt.sh root/usr/bin/catgirl-prompt
 	install scripts/chroot-man.sh root/usr/bin/man
 	tar -c -f chroot.tar -C root bin etc home lib libexec usr
d/> Still missing putting the URL in an X selection. 2021-02-07Enable mouse acceleration in XJune McEnroe 2021-02-07Set colours for Xt and cwmJune McEnroe And increase XTerm internalBorder. 2021-02-07Set urgency on bell in xtermJune McEnroe 2021-02-07Add bindings for brightness controlJune McEnroe Weirdly the Fn key doesn't change how the F row registers... I wonder if I can do something about that. 2021-02-07Set X key repeat rateJune McEnroe 2021-02-07Bump font size to 12June McEnroe 11 is what I use on macOS, but I feel like my eyes are working harder here. 2021-02-07Fully configure and rebind cwmJune McEnroe This is sort of a mix of trying to emulate macOS somewhat for my muscle memory and just rebinding some of the cwm defaults to use 4- rather than M-. 2021-02-07Add BintiJune McEnroe 2021-02-07Finish configuring xtermJune McEnroe 2021-02-06Enable tapping, reverse scroll, set scaling in wsconsctlJune McEnroe 2021-02-06Set root window to black on purple snowJune McEnroe 2021-02-06Add xmodmap configurationJune McEnroe 2021-02-06Add initial OpenBSD X configurationJune McEnroe cwm still needs a lot more rebinding, and I need to actually look at its other options. xterm definitely still needs some configuration, but I at least managed to get it to use a decent looking font. Very happy that OpenBSD includes Luxi Mono, which is what my usual font, Go Mono, is based on anyway. Still missing is xmodmap and such. 2021-02-06Add xterm output to schemeJune McEnroe