From 27b15bb32e09974b851ba7c8c5da36025afdc0e3 Mon Sep 17 00:00:00 2001 From: Loup Vaillant Date: Fri, 25 Oct 2019 19:53:09 +0200 Subject: [PATCH] Moved libhydrogen pkg-config file to the makefile That's the simplest way I know of to respect the PREFIX variable. --- makefile | 17 +++++++++++++++-- tests/externals/libhydrogen.pc | 11 ----------- 2 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 tests/externals/libhydrogen.pc diff --git a/makefile b/makefile index 684a6e2..a9496e9 100644 --- a/makefile +++ b/makefile @@ -44,9 +44,22 @@ install-doc: mkdir -p $(MAN_DIR) cp -r doc/man/man3/*.3monocypher $(MAN_DIR) -pkg-config-libhydrogen: tests/externals/libhydrogen.pc +pkg-config-libhydrogen: mkdir -p $(PKGCONFIG) - cp $< $(PKGCONFIG)/libhydrogen.pc + @echo "Creating $(PKGCONFIG)/libhydrogen.pc" + @echo "prefix=/$(PREFIX)" > $(PKGCONFIG)/libhydrogen.pc + @echo 'exec_prefix=$${prefix}' >> $(PKGCONFIG)/libhydrogen.pc + @echo 'libdir=$${exec_prefix}/lib' >> $(PKGCONFIG)/libhydrogen.pc + @echo 'includedir=$${prefix}/include' >> $(PKGCONFIG)/libhydrogen.pc + @echo '' >> $(PKGCONFIG)/libhydrogen.pc + @echo 'Name: libhydrogen' >> $(PKGCONFIG)/libhydrogen.pc + @echo 'Version: git-HEAD' >> $(PKGCONFIG)/libhydrogen.pc + @echo 'Description: Small, easy-to-use,' \ + 'hard-to-misuse cryptographic library.' \ + >> $(PKGCONFIG)/libhydrogen.pc + @echo '' >> $(PKGCONFIG)/libhydrogen.pc + @echo 'Libs: -L$${libdir} -lhydrogen' >> $(PKGCONFIG)/libhydrogen.pc + @echo 'Cflags: -I$${includedir}' >> $(PKGCONFIG)/libhydrogen.pc library: static-library dynamic-library static-library : lib/libmonocypher.a diff --git a/tests/externals/libhydrogen.pc b/tests/externals/libhydrogen.pc deleted file mode 100644 index 932562a..0000000 --- a/tests/externals/libhydrogen.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr/local -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: libhydrogen -Version: git-f1f061d -Description: Small, easy-to-use, hard-to-misuse cryptographic library. - -Libs: -L${libdir} -lhydrogen -Cflags: -I${includedir} -- 2.47.3