Make pkg-config file location $PREFIX compliant

It was previously semi-hard coded, presumably because I was tired.

diff --git a/makefile b/makefile
index 9e79ac5a8e9dfd2c68c94a66117ea4ce3ddf1ee7..2a332835ee026c1cec45b9bbd654ab08de37f45b 100644 (file)
--- a/makefile
+++ b/makefile
@@ -21,7 +21,7 @@ CC=gcc -std=gnu99 # speed tests don't work with -std=cxx, they need the POSIX ex
 CFLAGS= -pedantic -Wall -Wextra -O3 -march=native
 DESTDIR=
 PREFIX=usr/local
-PKGCONFIG=$(DESTDIR)usr/local/lib/pkgconfig
+PKGCONFIG=$(DESTDIR)/$(PREFIX)/lib/pkgconfig
 MAN_DIR=$(DESTDIR)/$(PREFIX)/share/man/man3
 
 .PHONY: all library static-library dynamic-library clean install test speed
@@ -31,19 +31,19 @@ install: library src/monocypher.h
        mkdir -p $(DESTDIR)/$(PREFIX)/lib
        cp lib/libmonocypher.a lib/libmonocypher.so $(DESTDIR)/$(PREFIX)/lib
        cp src/monocypher.h $(DESTDIR)/$(PREFIX)/include
-       @echo "Creating /$(PKGCONFIG)/monocypher.pc"
-       @echo "prefix=/$(PREFIX)"                > /$(PKGCONFIG)/monocypher.pc
-       @echo 'exec_prefix=$${prefix}'          >> /$(PKGCONFIG)/monocypher.pc
-       @echo 'libdir=$${exec_prefix}/lib'      >> /$(PKGCONFIG)/monocypher.pc
-       @echo 'includedir=$${prefix}/include'   >> /$(PKGCONFIG)/monocypher.pc
-       @echo ''                                >> /$(PKGCONFIG)/monocypher.pc
-       @echo 'Name: monocypher'                >> /$(PKGCONFIG)/monocypher.pc
-       @echo 'Version: 1.1.0'                  >> /$(PKGCONFIG)/monocypher.pc
+       @echo "Creating $(PKGCONFIG)/monocypher.pc"
+       @echo "prefix=/$(PREFIX)"                > $(PKGCONFIG)/monocypher.pc
+       @echo 'exec_prefix=$${prefix}'          >> $(PKGCONFIG)/monocypher.pc
+       @echo 'libdir=$${exec_prefix}/lib'      >> $(PKGCONFIG)/monocypher.pc
+       @echo 'includedir=$${prefix}/include'   >> $(PKGCONFIG)/monocypher.pc
+       @echo ''                                >> $(PKGCONFIG)/monocypher.pc
+       @echo 'Name: monocypher'                >> $(PKGCONFIG)/monocypher.pc
+       @echo 'Version: 1.1.0'                  >> $(PKGCONFIG)/monocypher.pc
        @echo 'Description: Easy to use, easy to deploy crypto library' \
-                                                >> /$(PKGCONFIG)/monocypher.pc
-       @echo ''                                >> /$(PKGCONFIG)/monocypher.pc
-       @echo 'Libs: -L$${libdir} -lmonocypher' >> /$(PKGCONFIG)/monocypher.pc
-       @echo 'Cflags: -I$${includedir}'        >> /$(PKGCONFIG)/monocypher.pc
+                                                >> $(PKGCONFIG)/monocypher.pc
+       @echo ''                                >> $(PKGCONFIG)/monocypher.pc
+       @echo 'Libs: -L$${libdir} -lmonocypher' >> $(PKGCONFIG)/monocypher.pc
+       @echo 'Cflags: -I$${includedir}'        >> $(PKGCONFIG)/monocypher.pc
        mkdir -p $(MAN_DIR)
        cp -r doc/man/man3/* $(MAN_DIR)
 
@@ -51,7 +51,6 @@ library: static-library dynamic-library
 static-library : lib/libmonocypher.a
 dynamic-library: lib/libmonocypher.so
 
-
 clean:
        rm -rf lib/
        rm -f  *.out