From f40454098c596dfb85cccfe7254d370442cca77c Mon Sep 17 00:00:00 2001
From: Curtis McEnroe <june@causal.agency>
Date: Sun, 28 Jul 2019 15:41:06 -0400
Subject: Remove old commands

---
 Makefile | 38 +++++++++++++++++---------------------
 1 file changed, 17 insertions(+), 21 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 7e8053e..ece7cca 100644
--- a/Makefile
+++ b/Makefile
@@ -1,36 +1,32 @@
-BINS = create destroy ingest ptee ssh-command view
-USER = stream
+CHROOT_USER = stream
+CHROOT_GROUP = ${CHROOT_USER}
 
 CFLAGS += -Wall -Wextra -Wpedantic
+LDFLAGS = -static
 LDLIBS = -lutil
 
-all: tags $(BINS)
+-include config.mk
+
+BINS = ptee
+
+all: tags ${BINS}
 
 tags: *.c
 	ctags -w *.c
 
-chroot.tar: $(BINS)
+chroot.tar: ${BINS}
 	mkdir -p root
 	install -d -o root -g wheel \
+		root \
 	    root/bin \
 	    root/home \
-	    root/lib \
-	    root/libexec \
-	    root/usr \
-	    root/usr/share \
 	    root/usr/share/misc
-	install -d -o $(USER) -g $(USER) root/home/$(USER)
-	install -o root -g wheel -m 555 /libexec/ld-elf.so.1 root/libexec
-	install -o root -g wheel -m 444 \
-	    /lib/libc.so.7 \
-	    /lib/libedit.so.7 \
-	    /lib/libncursesw.so.8 \
-	    /lib/libutil.so.9 \
-	    root/lib
-	install -o root -g wheel -m 444 /usr/share/misc/termcap.db root/usr/share/misc
-	install -o root -g wheel -m 555 /bin/sh root/bin
-	install -o root -g wheel -m 555 $(BINS) root/bin
-	tar -c -f chroot.tar -C root bin home lib libexec usr
+	install -d -o ${CHROOT_USER} -g ${CHROOT_GROUP} root/home/${CHROOT_USER}
+	cp -af /usr/share/locale root/usr/share
+	cp -fp /usr/share/misc/termcap.db root/usr/share/misc
+	cp -fp /rescue/sh root/bin
+	install ${BINS} root/bin
+	tar -c -f chroot.tar -C root bin home usr
 
 clean:
-	rm -f tags $(BINS) chroot.tar
+	rm -fr ${BINS} tags chroot.tar root
-- 
cgit 1.4.1

er'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/src/log/?id=1134af7da7776a0631995094a9225ce3541a9518&amp;showmsg=1&amp;follow=1'>root</a>/<a href='/src/log/doc?id=1134af7da7776a0631995094a9225ce3541a9518&amp;showmsg=1&amp;follow=1'>doc</a>/<a href='/src/log/doc/zlib?id=1134af7da7776a0631995094a9225ce3541a9518&amp;showmsg=1&amp;follow=1'>zlib</a>/<a href='/src/log/doc/zlib/gzputc.3?id=1134af7da7776a0631995094a9225ce3541a9518&amp;showmsg=1&amp;follow=1'>gzputc.3</a> (<a href='/src/log/doc/zlib/gzputc.3?id=1134af7da7776a0631995094a9225ce3541a9518&amp;showmsg=1'>unfollow</a>)</div><div class='content'><table class='list nowrap'><tr class='nohover'><th></th><th class='left'>Commit message (<a href='/src/log/doc/zlib/gzputc.3?id=1134af7da7776a0631995094a9225ce3541a9518&amp;follow=1'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2024-09-08 19:44:08 -0400'>2024-09-08</span></td><td class='logsubject'><a href='/src/commit/www/photo.causal.agency/trips.html?id=775260288133dc90bb600785772ac931854aa618&amp;follow=1'>Apply some bold to trips rendering</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
This seems easier to visually scan. The only other thing I'd like
is a nicer date rendering but JavaScript is useless for that.


</td></tr>
<tr class='logheader'><td><span title='2024-09-08 19:38:22 -0400'>2024-09-08</span></td><td class='logsubject'><a href='/src/commit/www/photo.causal.agency/trips.html?id=dd7fda85bcc69cd4cd35e006cffabf3bdf765104&amp;follow=1'>Render trips hopefully more efficiently</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2024-09-08 19:26:18 -0400'>2024-09-08</span></td><td class='logsubject'><a href='/src/commit/www/photo.causal.agency/trips.html?id=02cac2ffadee1d3f66426bb48a64aea78907878c&amp;follow=1'>Allow removing bodies and lenses</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2024-09-08 10:59:25 -0400'>2024-09-08</span></td><td class='logsubject'><a href='/src/commit/www/photo.causal.agency/trips.html?id=2c25b7204ecab1be0d128d984eabe35b10a3a418&amp;follow=1'>Limit body width so it looks less silly on desktop</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2024-09-07 21:02:03 -0400'>2024-09-07</span></td><td class='logsubject'><a href='/src/commit/www/photo.causal.agency/trips.html?id=74df90da35ed7886c4067fae700c9db1d3b2ef0a&amp;follow=1'>Handle no film being loaded</a></td><td>June McEnroe</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
</td></tr>
<tr class='logheader'><td><span title='2024-09-07 20:58:45 -0400'>2024-09-07</span></td><td class='logsubject'><a href='/src/commit/www/photo.causal.agency/trips.html?id=a7f8aa5246afbf9c01ca295bdd2af0e11faeb7d3&amp;follow=1'>Fancy up the text a little</a></td><td>June McEnroe