X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=Makefile;h=e506703faeb3b00603480a5ba5761d160126365f;hp=9b914527a7cbd9bc46eebf0d5662a24b4f32e148;hb=5af5acaa9aa8c28ebcb6eb7be8a5d61b1a4fbf34;hpb=1d214dd4031f5e88993063c84f46139c761714a3

diff --git a/Makefile b/Makefile
index 9b914527..e506703f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 2002/10/23 06:14:09 agotneja Exp $
+# $Id: Makefile,v 1.5.2.2 2002/10/25 02:44:23 hal9 Exp $
 #
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
@@ -26,17 +26,11 @@
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Log: Makefile,v $
-# Revision 1.9  2002/10/23 06:14:09  agotneja
-# Added FreeBSD checks to stop people from using the default 'make'
+# Revision 1.5.2.2  2002/10/25 02:44:23  hal9
+# Port of make install, etc from main trunk. Needs testing! Add Slackware
+# support, and other related changes. Update related docs.
 #
-# Revision 1.8  2002/10/23 05:41:45  agotneja
-# Added checks for Solaris 'make' command, and more extensive checks that
-# the user is running GNU make.
-#
-# Revision 1.7  2002/10/22 02:22:18  hal9
-# Look for gmake first, and fall back to make. More Solaris trouble.
-#
-# Revision 1.6  2002/09/05 14:35:17  oes
+# Revision 1.5.2.1  2002/08/05 17:46:13  oes
 # Change make to gmake to fix auto-build on Solaris
 #
 # Revision 1.5  2002/04/11 12:51:34  oes
@@ -58,16 +52,6 @@
 
 #############################################################################
 
-# This script will first try to use the GNU make command, then the standard
-# make command, checking whether the command returns 'GNU' as part of its
-# version string. Amend this to point to your GNU make command if it is
-# not in your path.
-# Further tests; 
-#   GNU  'make' sets the MAKE_VERSION variable
-#   Solaris 'make' sets the HOST_ARCH variable
-#   FreeBSD 'make' sets the MACHINE_ARCH variable
-# We check if this isn't GNU but matches one of the above we error out
-
 GNU_MAKE_CMD = gmake
 MAKE_CMD     = make
 
@@ -113,7 +97,6 @@ error:
 
 .PHONY: error
 
-
 #############################################################################
 
 ## Local Variables: