X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=windows%2FGNUmakefile;h=e807cd2945ec9911fa46827aaa0d3c85a8745390;hb=0b547be62a13f8febeb51318addc7bcb767a200a;hp=6c22d98b2420a5c52e79f56dfaedaa03c3455b68;hpb=b218e704f4d5d2fb8a385d134ba76b6490ff6758;p=privoxy.git

diff --git a/windows/GNUmakefile b/windows/GNUmakefile
index 6c22d98b..e807cd29 100755
--- a/windows/GNUmakefile
+++ b/windows/GNUmakefile
@@ -1,7 +1,7 @@
 ##########################################################################
 #
 # Written by and Copyright (C) 2002-2018 the Privoxy team.
-# http://www.privoxy.org/
+# https://www.privoxy.org/
 #
 # This script originally written by and Copyright (C) 2002
 # Jonathan Foster
@@ -53,7 +53,7 @@ DOSFILTER = $(SED) -e $$'s,$$,\r,'
 
 # Path to NSIS
 # MAKENSIS = ./nsis/nsis-2.30.exe
-MAKENSIS = ./nsis-3.03/makensis.exe
+MAKENSIS = /source/nsis-3.03/makensis.exe
 
 
 ##########################################################################
@@ -159,14 +159,11 @@ $(DEST)/templates/%: $(SOURCE)/templates/% $(DEST)/templates
 
 doc: $(DEST)/AUTHORS.txt $(DEST)/README.txt $(DEST)/LICENSE.txt
 
-webdoc: $(DEST)/doc/developer-manual $(DEST)/doc/faq $(DEST)/doc/images $(DEST)/doc/user-manual
+webdoc: $(DEST)/doc/developer-manual $(DEST)/doc/faq $(DEST)/doc/user-manual
 	cp $(SOURCE)/doc/webserver/p_doc.css $(DEST)/doc
 	cp $(SOURCE)/doc/webserver/p_doc.css $(DEST)/doc/user-manual/
 
 
-$(DEST)/doc/gpl.html: $(SOURCE)/doc/gpl.html $(DEST)/doc
-	$(DOSFILTER) < $< > $@ 
-
 $(DEST)/doc/%.txt : $(SOURCE)/doc/text/%.txt $(DEST)/doc
 	$(DOSFILTER) < $< > $@ 
 
@@ -177,14 +174,12 @@ $(DEST)/doc/developer-manual: $(DEST)/doc $(SOURCE)/doc/webserver/developer-manu
 $(DEST)/doc/user-manual: $(DEST)/doc $(SOURCE)/doc/webserver/user-manual/index.html
 	test -d $(DEST)/doc/user-manual      || mkdir $(DEST)/doc/user-manual
 	cp    $(SOURCE)/doc/webserver/user-manual/*.html $(DEST)/doc/user-manual/
+	cp    $(SOURCE)/doc/webserver/user-manual/*.jpg  $(DEST)/doc/user-manual/
 
 $(DEST)/doc/faq: $(DEST)/doc $(SOURCE)/doc/webserver/faq/index.html
 	test -d $(DEST)/doc/faq              || mkdir $(DEST)/doc/faq
 	cp    $(SOURCE)/doc/webserver/faq/*.html $(DEST)/doc/faq/
 
-$(DEST)/doc/images: $(DEST)/doc
-	cp -r $(SOURCE)/doc/webserver/images/ $(DEST)/doc
-
 ##########################################################################
 # That's all, folks!
 ##########################################################################