summary refs log tree commit diff
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
parentDetect pings anywhere in message (diff)
downloadcatgirl-e713e6a1620c8859b75b9d4f429d777caace8f87.tar.gz
catgirl-e713e6a1620c8859b75b9d4f429d777caace8f87.zip
Improve configuration of 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 \