about summary refs log tree commit diff
path: root/Makefile
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2018-08-13 19:27:22 -0400
committerJune McEnroe <june@causal.agency>2018-08-13 19:27:22 -0400
commite713e6a1620c8859b75b9d4f429d777caace8f87 (patch)
treeca94049b9a835604c20771c4741c9ca650a8af38 /Makefile
parentDetect pings anywhere in message (diff)
downloadcatgirl-e713e6a1620c8859b75b9d4f429d777caace8f87.tar.gz
catgirl-e713e6a1620c8859b75b9d4f429d777caace8f87.zip
Improve configuration of Makefile
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile12
1 files changed, 8 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index f9c903e..a1044d3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,12 @@
-USER = chat
+LIBRESSL_PREFIX = /usr/local /usr/local/opt/libressl
+CHROOT_USER = chat
+CHROOT_GROUP = $(CHROOT_USER)
+
 CFLAGS += -Wall -Wextra -Wpedantic
-CFLAGS += -I/usr/local/include -I/usr/local/opt/libressl/include
-LDFLAGS += -L/usr/local/lib -L/usr/local/opt/libressl/lib
+CFLAGS += $(LIBRESSL_PREFIX:%=-I%/include)
+LDFLAGS += $(LIBRESSL_PREFIX:%=-L%/lib)
 LDLIBS = -lcursesw -ltls
+
 OBJS = chat.o edit.o handle.o input.o irc.o pls.o tab.o tag.o term.o ui.o url.o
 
 all: tags chat
@@ -29,7 +33,7 @@ chroot.tar: chat
 		root/usr/local/etc/ssl \
 		root/usr/share \
 		root/usr/share/misc
-	install -d -o $(USER) -g $(USER) root/home/$(USER)
+	install -d -o $(CHROOT_USER) -g $(CHROOT_GROUP) root/home/$(CHROOT_USER)
 	cp -p -f /libexec/ld-elf.so.1 root/libexec
 	cp -p -f \
 		/lib/libc.so.7 \
href='/src/commit/home/.kshrc?id=d974d314e83c6708c106af53ed3a25d7b116c65b&follow=1'>Alias bc='bc -l'June McEnroe 2018-08-20Update usage of scheme in READMEJune McEnroe 2018-08-20Use scheme.h in fbatt and fbclockJune McEnroe 2018-08-20Generate scheme.hJune McEnroe 2018-08-20Add dependencies on gfx.hJune McEnroe 2018-08-18Add Blondie — Heart of GlassJune McEnroe Why didn't I know about this song? I love it. 2018-08-18Set FCEDIT=$EDITORJune McEnroe 2018-08-18Only post commits with bodies to MastodonJune McEnroe 2018-08-18Run tf/cfg link script with /bin/shJune McEnroe 2018-08-18Run {,s,t}up with /bin/shJune McEnroe 2018-08-18Use whence instead of typeJune McEnroe type is an alias for whence -v and is more for human consumption. 2018-08-18Cut off path components until right prompt fitsJune McEnroe Keeps paths valid (from somehwere) rather than abrupt truncation. 2018-08-17Add "private" alias to source encrypted fileJune McEnroe Why is there no easy way to *edit* an encrypted file? 2018-08-17Add vim mapping to add a #includeJune McEnroe