summary refs log tree commit diff
diff options
context:
space:
mode:
-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 \
736253f8ab0197a6652f7&follow=1'>tests: introduce strip_header() helper functionJohn Keeping 2013-05-22shared.c: use die_errno() where appropriateJohn Keeping 2013-05-22html.c: die when write failsJohn Keeping 2013-05-22ui-log: add <span/> around commit decorationsJohn Keeping 2013-05-22Makefile: fix parallel "make test"John Keeping 2013-05-18cache.c: fix cache_lsJohn Keeping 2013-05-13t0109: "function" is a bash-ismJohn Keeping 2013-05-13New mailing list.Jason A. Donenfeld 2013-04-30ui-snapshot: do not access $HOMEJason A. Donenfeld 2013-04-27t0001: validate Git -rcN version numbers correctlyJohn Keeping 2013-04-27git: update to 1.8.2.2John Keeping 2013-04-17scan-tree: fix regression in section-from-path=-1John Keeping 2013-04-15t0001: ignore ".dirty" suffix on Git versionJohn Keeping 2013-04-15tests: set TEST_OUTPUT_DIRECTORY to the CGit test directoryJohn Keeping 2013-04-15t0109: test more URLsJohn Keeping 2013-04-10cgitrc.5.txt: Specify when scan-path must be defined before.Jason A. Donenfeld 2013-04-10ui-snapshot.c: Prepend "V" when guessing ref namesLukas Fleischer 2013-04-10t0107: Skip ZIP tests if unzip(1) isn't availableLukas Fleischer 2013-04-10tests/: Do not use `sed -i`Lukas Fleischer 2013-04-10Add branch-sort and repo.branch-sort options.Jason A. Donenfeld 2013-04-10t0109: chain operations with &&John Keeping 2013-04-10cgit.c: Do not restore unset environment variablesLukas Fleischer 2013-04-09t0107: Use `tar -z` for gzip'ed archivesLukas Fleischer