aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMattias Andrée <maandree@kth.se>2021-08-28 23:38:16 +0200
committerMattias Andrée <maandree@kth.se>2021-08-28 23:38:16 +0200
commit4e116dfbcbe8a3b7a72db4c698b930376540ed6b (patch)
tree19a50d13ba1ecd766b4b0da27e0ae5e1e9634292
parentUse rm -f in Makefile (diff)
downloadlibcolour-4e116dfbcbe8a3b7a72db4c698b930376540ed6b.tar.gz
libcolour-4e116dfbcbe8a3b7a72db4c698b930376540ed6b.tar.bz2
libcolour-4e116dfbcbe8a3b7a72db4c698b930376540ed6b.tar.xz
m libcolour.7
Signed-off-by: Mattias Andrée <maandree@kth.se>
Diffstat (limited to '')
-rw-r--r--.gitignore1
-rw-r--r--LICENSE2
-rw-r--r--Makefile8
-rw-r--r--libcolour.7 (renamed from libcolour.7.in)5
4 files changed, 5 insertions, 11 deletions
diff --git a/.gitignore b/.gitignore
index 0d8d92a..a4211ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,4 @@
*.out
/__pycache__/
/test
-/libcolour.7
/conversion-matrices.h
diff --git a/LICENSE b/LICENSE
index 383201c..8e3ba8a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
ISC License
-© 2016, 2017 Mattias Andrée <maandree@kth.se>
+© 2016, 2017, 2021 Mattias Andrée <maandree@kth.se>
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
diff --git a/Makefile b/Makefile
index 9b1b6d9..8cef49a 100644
--- a/Makefile
+++ b/Makefile
@@ -79,7 +79,7 @@ MAN3_SYMLINKS =\
libcolour_convert_en_masse_llf.3
-all: libcolour.a libcolour.so.$(SO_VERSION) libcolour.7 test
+all: libcolour.a libcolour.so.$(SO_VERSION) test
conversion-matrices.h: matrices.py
@@ -122,11 +122,7 @@ test: test.o libcolour.a
$(CC) -o $@ $^ $(LDFLAGS)
-libcolour.7: libcolour.7.in
- sed 's:/usr/local:$(PREFIX):g' < libcolour.7.in > libcolour.7
-
-
-install: libcolour.a libcolour.so.$(SO_VERSION) libcolour.7
+install: libcolour.a libcolour.so.$(SO_VERSION)
mkdir -p -- "$(DESTDIR)$(PREFIX)/include"
cp -- libcolour.h "$(DESTDIR)$(PREFIX)/include/libcolour.h"
chmod -- 644 "$(DESTDIR)$(PREFIX)/include/libcolour.h"
diff --git a/libcolour.7.in b/libcolour.7
index ee8c2df..acc0000 100644
--- a/libcolour.7.in
+++ b/libcolour.7
@@ -14,9 +14,8 @@ colour spaces.
To use libcolour, include the header file
.B <libcolour.h>
and link with
-.B /usr/local/lib/libcolour.a -lm
-or
-.BR -lcolour .
+.B -lcolour
+.BR -lm .
.SH COLOUR MODELS
.B libcolour
supports a number of colour models. A colour model