summary refs log tree commit diff
path: root/configure
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-05-23 14:12:07 -0400
committerJune McEnroe <june@causal.agency>2020-05-23 19:14:47 -0400
commitfd679bbca8ad24c0ddd69e3d2018fbbe4bb8e54d (patch)
tree1d61e17c85746106154fc37c18e2ab29014d8162 /configure
parentRevert "Send blank line after 10 minutes idle" (diff)
downloadcatgirl-fd679bbca8ad24c0ddd69e3d2018fbbe4bb8e54d.tar.gz
catgirl-fd679bbca8ad24c0ddd69e3d2018fbbe4bb8e54d.zip
Don't compress man page or use configure on FreeBSD
Also use DESTDIR in install.
Diffstat (limited to '')
-rwxr-xr-xconfigure32
1 files changed, 8 insertions, 24 deletions
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
install.shJune McEnroe 2021-02-07Swap root window coloursJune McEnroe 2021-02-07Add -X flag to install X stuff on OpenBSDJune McEnroe 2021-02-07Adjust brightness by smaller incrementsJune McEnroe 2021-02-07Fix cwm window cycling, move big by defaultJune McEnroe 2021-02-07Use class names for Foreground, Background, BorderColorJune McEnroe 2021-02-07Add simple battery status and clock to xsessionJune McEnroe 2021-02-07Set cursor theme and sizeJune McEnroe 2021-02-07Use scrot for up -s if no screencaptureJune McEnroe 2021-02-07Enable mouse acceleration in XJune McEnroe 2021-02-07Set colours for Xt and cwmJune McEnroe 2021-02-07Set urgency on bell in xtermJune McEnroe 2021-02-07Add bindings for brightness controlJune McEnroe 2021-02-07Set X key repeat rateJune McEnroe 2021-02-07Bump font size to 12June McEnroe 2021-02-07Fully configure and rebind cwmJune McEnroe 2021-02-07Add BintiJune McEnroe 2021-02-07Finish configuring xtermJune McEnroe 2021-02-06Enable tapping, reverse scroll, set scaling in wsconsctlJune McEnroe 2021-02-06Set root window to black on purple snowJune McEnroe 2021-02-06Add xmodmap configurationJune McEnroe 2021-02-06Add initial OpenBSD X configurationJune McEnroe 2021-02-06Add xterm output to schemeJune McEnroe