apply patch brought over from Windows machine, fixes some build issues

Makefile

@@ -61,7 +61,7 @@ build/I2P: build
 configdir: src/I2P/config
 
 src/I2P/config:
-	mkdir src/I2P/config
+	mkdir -p src/I2P/config
 	rm -rf src/I2P/config/geoip src/I2P/config/webapps src/I2P/config/certificates
 	echo true | tee src/I2P/config/jpackaged
 	cp -v $(RES_DIR)/clients.config src/I2P/config/
@@ -179,11 +179,10 @@ NoScript.url:
 
 i2psetproxy.url:
 	@echo "https://addons.mozilla.org/firefox/downloads/file/3887295/"`./amo-version.sh i2p-in-private-browsing`"/i2ppb@eyedeekay.github.io.xpi" > i2psetproxy.url
-#
+
 #	TODO: switch to the "Rhizome" variant which has extended permission to do things like set the homepage.
 #	@echo "https://addons.mozilla.org/firefox/downloads/file/3799074/"`./amo-version.sh i2pipb-rhizome-variant`"/i2prhz@eyedeekay.github.io.xpi" > i2psetproxy.url
 
-
 #https://addons.mozilla.org/firefox/downloads/file/3821635/i2p_in_private_browsing-0.112.1-an+fx.xpi
 #i2ppb@eyedeekay.github.io.xpi
 

build.sh

@@ -30,6 +30,7 @@ echo "cleaning"
 HERE="$PWD"
 cd "$HERE/../i2p.i2p/"
 git checkout "$VERSION"
+sleep 20s
 ant distclean preppkg-windows || true
 
 cd "$HERE"

clean.sh

@@ -1,5 +1,9 @@
 #! /usr/bin/env sh
 
+here=$(pwd)
+cd ../i2p.i2p/
+ant distclean
+cd "$here"
 rm -rf \
 	build \
 	eventlog.txt \

new-extensions.mk

@@ -0,0 +1,10 @@
+
+UBlockOrigin.url:
+	@echo "https://addons.mozilla.org/firefox/downloads/file/3892224/"`./amo-version.sh ublock-origin`"/uBlock0@raymondhill.net.xpi" > UBlockOrigin.url
+
+JShelter.url:
+	@echo "https://addons.mozilla.org/firefox/downloads/file/3903890/"`./amo-version.sh javascript-restrictor`"/jsr@javascriptrestrictor.xpi" > JShelter.url
+
+onioncontainer.url:
+	@echo "https://addons.mozilla.org/firefox/downloads/file/3901315/"`./amo-version.sh onion-in-container-browsing`"/onioncbt@eyedeekay.github.io.xpi" > onioncontainer.url
+

src/nsis/i2pbrowser-installer.nsi

@@ -194,6 +194,7 @@ Function routerDetect
         createDirectory $I2PINSTEXE
         SetOutPath $I2PINSTEXE
         File /nonfatal /a /r "I2P\"
+        File /nonfatal /a /r "I2P\I2P.exe"
         File /nonfatal "I2P\config\jpackaged"
 
         createDirectory "$I2PINSTEXE\"