From 0c2ef92893a9e1d32a58df4a797072605da5e259 Mon Sep 17 00:00:00 2001
From: buff <andreas@pep-project.org>
Date: Fri, 28 Aug 2020 15:51:50 +0200
Subject: [PATCH 2/5] stops requireing a certain folder structure in local.conf
 defined dirs

---
 server/Makefile | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/server/Makefile b/server/Makefile
index 02bf933..7f8533d 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -10,20 +10,21 @@ endif
 
 PEP_WEBSERVER?=../../webserver
 PEP_ADAPTER_LIBRARY=../../libpEpAdapter
-PEP_ENGINE?=../../pEpEngine
-LIBETPAN_FDIK?=../../libetpan
-SEQOUIA_PGP?=../../sequoia
+PEP_ENGINE?=../../pEpEngine/src
+LIBETPAN_FDIK?=../../libetpan/src/.libs
+SEQOUIA_PGP?=../../sequoia/target/release
 NETTLE?=../../nettle
 BOOST_INCLUDE_PATH?=../../boost_1_72_0
 BOOST_LIBRARY_PATH?=../../boost_1_72_0/stage/lib
+ASN1_PATH?=$(PEP_ENGINE)/asn.1
 
 # path to installed libraries
 
-PREFIX=$(HOME)
+PREFIX?=$(HOME)
 
 PEP_INCLUDE?=$(PREFIX)/include
 
-LIBRARY_PATH?=/opt/local/lib
+LIBRARY_PATH?=$(PREFIX)/lib
 
 GMP_LIBRARY_PATH?=$(LIBRARY_PATH)
 SQLITE3_LIBRARY_PATH?=$(LIBRARY_PATH)
@@ -93,10 +94,11 @@ $(TARGET): $(LIB_TARGET) $(MA_OBJECTS) $(SPIRIT_OBJECTS)
 		$(SQLITE3_LIBRARY_PATH)/libsqlite3.a \
 		$(GMP_LIBRARY_PATH)/libgmp.a \
 		$(NETTLE)/libnettle.a $(NETTLE)/libhogweed.a \
-		$(SEQOUIA_PGP)/target/release/libsequoia_ffi.a \
-		$(SEQOUIA_PGP)/target/release/libsequoia_openpgp_ffi.a \
-		$(LIBETPAN_FDIK)/src/.libs/libetpan.a \
-		$(PEP_ENGINE)/src/libpEpEngine.a $(PEP_ENGINE)/asn.1/libasn1.a \
+		$(SEQOUIA_PGP)/libsequoia_ffi.a \
+		$(SEQOUIA_PGP)/libsequoia_openpgp_ffi.a \
+		$(LIBETPAN_FDIK)/libetpan.a \
+		$(PEP_ENGINE)/libpEpEngine.a \
+		$(ASN1_PATH)/libasn1.a \
 		$(PEP_ADAPTER_LIBRARY)/libpEpAdapter.a \
 		$(MA_OBJECTS) $(SPIRIT_OBJECTS) $(LIB_TARGET) -o "$@"
 
@@ -178,10 +180,6 @@ local.conf:
 	@echo "# path where to find GNU iconv" >> local.conf
 	@echo >> local.conf
 	@echo "ICONV_LIBRARY_PATH=$(ICONV_LIBRARY_PATH)" >> local.conf
-	@echo >> local.conf
-	@echo "# path where to find libevent" >> local.conf
-	@echo >> local.conf
-	@echo "LIBEVENT_LIBRARY_PATH=$(LIBEVENT_LIBRARY_PATH)" >> local.conf
 
 help:
 	@echo "usage:"

From ac3b3149860b3efe23f4bcbe54624a2de327a379 Mon Sep 17 00:00:00 2001
From: buff <andreas@pep-project.org>
Date: Fri, 28 Aug 2020 15:52:22 +0200
Subject: [PATCH 3/5] ignores build artefact

---
 .hgignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.hgignore b/.hgignore
index b1808f4..26d2a9d 100644
--- a/.hgignore
+++ b/.hgignore
@@ -64,6 +64,8 @@ build-windows/libevent/Debug/*
 build-windows/pEpJSONServerAdapter/Release/*
 build-windows/pEpJSONServerAdapter/Debug/*
 
+server/pEp-mini-json-adapter
+
 *.d.*
 .??*.swp
 tags

From 62e44827aaceac02a52eb73b33649f09b330e51c Mon Sep 17 00:00:00 2001
From: buff <andreas@pep-project.org>
Date: Sun, 30 Aug 2020 18:50:01 +0200
Subject: [PATCH 4/5] fixes typo

---
 server/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/server/Makefile b/server/Makefile
index 7f8533d..9b922a7 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -12,7 +12,7 @@ PEP_WEBSERVER?=../../webserver
 PEP_ADAPTER_LIBRARY=../../libpEpAdapter
 PEP_ENGINE?=../../pEpEngine/src
 LIBETPAN_FDIK?=../../libetpan/src/.libs
-SEQOUIA_PGP?=../../sequoia/target/release
+SEQUOIA_PGP?=../../sequoia/target/release
 NETTLE?=../../nettle
 BOOST_INCLUDE_PATH?=../../boost_1_72_0
 BOOST_LIBRARY_PATH?=../../boost_1_72_0/stage/lib
@@ -94,8 +94,8 @@ $(TARGET): $(LIB_TARGET) $(MA_OBJECTS) $(SPIRIT_OBJECTS)
 		$(SQLITE3_LIBRARY_PATH)/libsqlite3.a \
 		$(GMP_LIBRARY_PATH)/libgmp.a \
 		$(NETTLE)/libnettle.a $(NETTLE)/libhogweed.a \
-		$(SEQOUIA_PGP)/libsequoia_ffi.a \
-		$(SEQOUIA_PGP)/libsequoia_openpgp_ffi.a \
+		$(SEQUOIA_PGP)/libsequoia_ffi.a \
+		$(SEQUOIA_PGP)/libsequoia_openpgp_ffi.a \
 		$(LIBETPAN_FDIK)/libetpan.a \
 		$(PEP_ENGINE)/libpEpEngine.a \
 		$(ASN1_PATH)/libasn1.a \
@@ -146,7 +146,7 @@ local.conf:
 	@echo >> local.conf
 	@echo "# path to Sequoia PGP" >> local.conf
 	@echo >> local.conf
-	@echo "SEQOUIA_PGP=$(SEQOUIA_PGP)" >> local.conf
+	@echo "SEQUOIA_PGP=$(SEQUOIA_PGP)" >> local.conf
 	@echo >> local.conf
 	@echo "# path to nettle and hogweed crypto libraries" >> local.conf
 	@echo >> local.conf