X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=windows%2FMakefile.top.bor;h=ce0eb20f21f22c413d58625c9187c76399d9f69f;hp=172e80198c48a23771a311549b9ca2b539e09835;hb=bc7ea11d8eac6f2378731b98172d9f9facab3e78;hpb=b2be7522c745827b521a8ed535201427df32eec7

diff --git a/windows/Makefile.top.bor b/windows/Makefile.top.bor
index 172e8019..ce0eb20f 100644
--- a/windows/Makefile.top.bor
+++ b/windows/Makefile.top.bor
@@ -1,9 +1,10 @@
 # Makefile for `Wget' utility
-# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1995, 1996, 1997, 2004, 2007,
+# 2008 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 
 # This program is distributed in the hope that it will be useful,
@@ -12,20 +13,20 @@
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-# In addition, as a special exception, the Free Software Foundation
-# gives permission to link the code of its release of Wget with the
-# OpenSSL project's "OpenSSL" library (or with modified versions of it
-# that use the same license as the "OpenSSL" library), and distribute
-# the linked executables.  You must obey the GNU General Public License
-# in all respects for all of the code used other than "OpenSSL".  If you
-# modify this file, you may extend this exception to your version of the
-# file, but you are not obligated to do so.  If you do not wish to do
-# so, delete this exception statement from your version.
-
-RM = del
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Additional permission under GNU GPL version 3 section 7
+
+# If you modify this program, or any covered work, by linking or
+# combining it with the OpenSSL project's OpenSSL library (or a
+# modified version of that library), containing parts covered by the
+# terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+# grants you additional permission to convey the resulting work.
+# Corresponding Source for a non-source form of such a combination
+# shall include the source code for the parts of OpenSSL used as well
+# as that of the covered work.
+
+RM = -del
 CP = copy
 
 # flags passed to recursive makes in subdirectories
@@ -37,39 +38,42 @@ SUBDIRS = src doc #util
 all: Makefile $(SUBDIRS)
 
 $(SUBDIRS): 
-        cd $@
-        $(MAKE)
-        cd ..
+	cd $@
+	$(MAKEDIR)\$(MAKE)
+	cd ..
 
 # install everything
 install:
-        echo Just do it.
+	echo Just do it.
 
 clean:		clean-recursive		clean-top
 distclean:	distclean-recursive	distclean-top
 realclean:	realclean-recursive	realclean-top
 
 clean-top:
-        $(RM) *.bak
-        $(RM) *.zip
+	$(RM) *.bak
+	$(RM) *.zip
 
 distclean-top: clean-top
-        $(RM) Makefile
-        $(RM) config.h
+	$(RM) Makefile
+	$(RM) config.h
 
 realclean-top: distclean-top
 
 clean-recursive distclean-recursive realclean-recursive:
-        cd src
-        $(MAKE) $(@:-recursive=)
-        cd ..\\doc
-        $(MAKE) $(@:-recursive=)
-        cd ..
+	cd src
+	$(MAKEDIR)\$(MAKE) $(@:-recursive=)
+	cd ..\doc
+	$(MAKEDIR)\$(MAKE) $(@:-recursive=)
+	cd ..
 
 bindist: wget.zip
 
 wget.zip: $(SUBDIRS)
-        $(RM) wget.zip
-        zip -Djl9 wget.zip AUTHORS COPYING INSTALL MACHINES MAILING-LIST NEWS README DOC\\sample.wgetrc
-        zip -Dj9 wget.zip SRC\\WGET.EXE DOC\\WGET.HLP
+	$(RM) wget.zip
+	$(RM) cacert.pem
+	src\wget http://curl.haxx.se/ca/cacert.pem
+	zip -Djl9 wget.zip AUTHORS COPYING INSTALL MAILING-LIST NEWS README doc/sample.wgetrc 
+	zip -Dj9 wget.zip src/wget.exe doc/wget.hlp cacert.pem 
+	zip -Dj9 wget.zip c:\openssl\bin\libeay32.dll c:\openssl\bin\ssleay32.dll c:\openssl\bin\msvcr80.dll