diff options
| -rw-r--r-- | Makefile | 23 | ||||
| -rw-r--r-- | README.7 | 6 | ||||
| -rwxr-xr-x | configure | 32 |
3 files changed, 26 insertions, 35 deletions
diff --git a/Makefile b/Makefile index 68e673b..f5c9854 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,12 @@ PREFIX = /usr/local MANDIR = ${PREFIX}/share/man +CFLAGS += -I${PREFIX}/include +LDFLAGS += -L${PREFIX}/lib + CEXTS = gnu-case-range gnu-conditional-omitted-operand CFLAGS += -std=c11 -Wall -Wextra -Wpedantic ${CEXTS:%=-Wno-%} -LDLIBS = -lcrypto -ltls -lncursesw +LDLIBS = -lncursesw -ltls -include config.mk @@ -36,23 +39,23 @@ clean: rm -f tags catgirl ${OBJS} install: catgirl catgirl.1 - install -d ${PREFIX}/bin ${MANDIR}/man1 - install catgirl ${PREFIX}/bin - gzip -c catgirl.1 > ${MANDIR}/man1/catgirl.1.gz + install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1 + install catgirl ${DESTDIR}${PREFIX}/bin + install -m 644 catgirl.1 ${DESTDIR}${MANDIR}/man1 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 ${CC} ${LDFLAGS} scripts/sandman.o -framework Cocoa -o $@ install-sandman: scripts/sandman scripts/sandman.1 - install -d ${PREFIX}/bin ${MANDIR}/man1 - install scripts/sandman ${PREFIX}/bin - gzip -c scripts/sandman.1 > ${MANDIR}/man1/sandman.1.gz + install -d ${DESTDIR}${PREFIX}/bin ${DESTDIR}${MANDIR}/man1 + install scripts/sandman ${DESTDIR}${PREFIX}/bin + install -m 644 scripts/sandman.1 ${DESTDIR}${MANDIR}/man1 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_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 -fp /usr/share/misc/termcap.db root/usr/share/misc 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-man.sh root/usr/bin/man tar -c -f chroot.tar -C root bin etc home lib libexec usr diff --git a/README.7 b/README.7 index 0bc3b13..9bd41bb 100644 --- a/README.7 +++ b/README.7 @@ -1,4 +1,4 @@ -.Dd May 5, 2020 +.Dd May 23, 2020 .Dt README 7 .Os "Causal Agency" .\" To view this file, run: man ./README.7 @@ -90,6 +90,10 @@ It primarily targets .Fx and macOS, as well as Linux. +The +.Pa configure +step is not necessary on +.Fx . .Bd -literal -offset indent \&./configure make all diff --git a/configure b/configure index b0f818f..88bfb1a 100755 --- a/configure +++ b/configure @@ -1,36 +1,20 @@ #!/bin/sh set -eu -case "$(uname)" in - (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 +exec >config.mk libs='libcrypto libtls ncursesw' pkg-config --print-errors $libs -cat >config.mk <<EOF +cat <<EOF 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) LDLIBS = $(pkg-config --libs-only-l $libs) EOF -case "$(uname)" in - (Linux) - if ! grep -q -e '-D_GNU_SOURCE' config.mk; then - echo 'CFLAGS += -D_GNU_SOURCE' >> config.mk - fi - ;; -esac +if [ "$(uname)" = 'Linux' ]; then + cat <<-EOF + CFLAGS += -D_GNU_SOURCE + EOF +fi |