dzwdz
/
catboy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't compress man page or use configure on FreeBSD 

Also use DESTDIR in install.
master
C. McEnroe 2020-05-23 14:12:07 -04:00
parent 4282574c18
commit fd679bbca8
3 changed files with 26 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Makefile
View File

@ -1,9 +1,12 @@
PREFIX = /usr/local PREFIX = /usr/local
MANDIR = ${PREFIX}/share/man MANDIR = ${PREFIX}/share/man
CFLAGS += -I${PREFIX}/include
LDFLAGS += -L${PREFIX}/lib
CEXTS = gnu-case-range gnu-conditional-omitted-operand CEXTS = gnu-case-range gnu-conditional-omitted-operand
CFLAGS += -std=c11 -Wall -Wextra -Wpedantic ${CEXTS:%=-Wno-%} CFLAGS += -std=c11 -Wall -Wextra -Wpedantic ${CEXTS:%=-Wno-%}
LDLIBS = -lcrypto -ltls -lncursesw LDLIBS = -lncursesw -ltls
-include config.mk -include config.mk
@ -36,23 +39,23 @@ clean:
rm -f tags catgirl ${OBJS} rm -f tags catgirl ${OBJS}
install: catgirl catgirl.1 install: catgirl catgirl.1
install -d ${PREFIX}/bin ${MANDIR}/man1 install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1
install catgirl ${PREFIX}/bin install catgirl ${DESTDIR}${PREFIX}/bin
gzip -c catgirl.1 > ${MANDIR}/man1/catgirl.1.gz install -m 644 catgirl.1 ${DESTDIR}${MANDIR}/man1
uninstall: 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 scripts/sandman: scripts/sandman.o
${CC} ${LDFLAGS} scripts/sandman.o -framework Cocoa -o $@ ${CC} ${LDFLAGS} scripts/sandman.o -framework Cocoa -o $@
install-sandman: scripts/sandman scripts/sandman.1 install-sandman: scripts/sandman scripts/sandman.1
install -d ${PREFIX}/bin ${MANDIR}/man1 install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1
install scripts/sandman ${PREFIX}/bin install scripts/sandman ${DESTDIR}${PREFIX}/bin
gzip -c scripts/sandman.1 > ${MANDIR}/man1/sandman.1.gz install -m 644 scripts/sandman.1 ${DESTDIR}${MANDIR}/man1
uninstall-sandman: 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_USER = chat
CHROOT_GROUP = ${CHROOT_USER} 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 -af /usr/share/locale root/usr/share
cp -fp /usr/share/misc/termcap.db root/usr/share/misc cp -fp /usr/share/misc/termcap.db root/usr/share/misc
cp -fp /rescue/sh /usr/bin/mandoc /usr/bin/less root/bin 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-prompt.sh root/usr/bin/catgirl-prompt
install scripts/chroot-man.sh root/usr/bin/man install scripts/chroot-man.sh root/usr/bin/man
tar -c -f chroot.tar -C root bin etc home lib libexec usr tar -c -f chroot.tar -C root bin etc home lib libexec usr

6
README.7
View File

@ -1,4 +1,4 @@
.Dd May 5, 2020 .Dd May 23, 2020
.Dt README 7 .Dt README 7
.Os "Causal Agency" .Os "Causal Agency"
.\" To view this file, run: man ./README.7 .\" To view this file, run: man ./README.7
@ -90,6 +90,10 @@ It primarily targets
.Fx .Fx
and macOS, and macOS,
as well as Linux. as well as Linux.
The
.Pa configure
step is not necessary on
.Fx .
.Bd -literal -offset indent .Bd -literal -offset indent
\&./configure \&./configure
make all make all

32
configure vendored
View File

@ -1,36 +1,20 @@
#!/bin/sh #!/bin/sh
set -eu set -eu
case "$(uname)" in exec >config.mk
(FreeBSD)
if ! pkg info -e libressl; then
echo 'LibreSSL required'
exit 1
fi
prefix=$(pkg query '%p' libressl)
cat >config.mk <<-EOF
CFLAGS += -I${prefix}/include
CFLAGS += -D'OPENSSL_BIN="${prefix}/bin/openssl"'
LDFLAGS += -L${prefix}/lib
EOF
exit
;;
esac
libs='libcrypto libtls ncursesw' libs='libcrypto libtls ncursesw'
pkg-config --print-errors $libs pkg-config --print-errors $libs
cat >config.mk <<EOF cat <<EOF
CFLAGS += $(pkg-config --cflags $libs) CFLAGS += $(pkg-config --cflags $libs)
CFLAGS += -D'OPENSSL_BIN="$(pkg-config --variable=prefix openssl)/bin/openssl"' CFLAGS += -D'OPENSSL_BIN="$(pkg-config --variable=exec_prefix openssl)/bin/openssl"'
LDFLAGS += $(pkg-config --libs-only-L $libs) LDFLAGS += $(pkg-config --libs-only-L $libs)
LDLIBS = $(pkg-config --libs-only-l $libs) LDLIBS = $(pkg-config --libs-only-l $libs)
EOF EOF
case "$(uname)" in if [ "$(uname)" = 'Linux' ]; then
(Linux) cat <<-EOF
if ! grep -q -e '-D_GNU_SOURCE' config.mk; then CFLAGS += -D_GNU_SOURCE
echo 'CFLAGS += -D_GNU_SOURCE' >> config.mk EOF
fi fi
;;
esac