windows/privoxy_winthreads.nsi: Fix spelling of 'original'

[privoxy.git] / windows / GNUmakefile

diff --git a/windows/GNUmakefile b/windows/GNUmakefile
index 5c6551f..e807cd2 100755 (executable)
--- a/windows/GNUmakefile
+++ b/windows/GNUmakefile
@@ -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!
 ##########################################################################