Allow metrics.torproject.org

[privoxy.git] / Makefile

diff --git a/Makefile b/Makefile
index 1618ef5..e506703 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.7 2002/10/22 02:22:18 hal9 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,10 +26,11 @@
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 # $Log: Makefile,v $
-# Revision 1.7  2002/10/22 02:22:18  hal9
-# Look for gmake first, and fall back to make. More Solaris trouble.
+# 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.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
@@ -51,15 +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; Solaris 'make' sets the HOST_ARCH variable, GNU  'make'
-# sets the MAKE_VERSION variable, so a test is made that the former is
-# non-zero and the latter is zero, if so we bail out with an error message.
-
-
 GNU_MAKE_CMD = gmake
 MAKE_CMD     = make
 
@@ -67,7 +59,7 @@ error:
        @if [ -f GNUmakefile ]; then \
            echo "***"; \
            echo "*** You are not using the GNU version of Make - maybe it's called gmake"; \
-           echo "*** or it's in a different directory?"; \
+           echo "*** or it's in a different PATH? Please read INSTALL." ; \
            echo "***"; \
            exit 1; \
         elif test -n "$(HOST_ARCH)"  && test -z "$(MAKE_VERSION)" ; then \
@@ -76,6 +68,12 @@ error:
            echo "*** and re-run 'make' "; \
            echo "***"; \
            exit 1 ; \
+        elif test -n "$(MACHINE_ARCH)"  && test -z "$(MAKE_VERSION)" ; then \
+           echo "***"; \
+           echo "*** You are not using GNU Make on FreeBSD, please make sure you do" ; \
+           echo "*** and re-run 'make' "; \
+           echo "***"; \
+           exit 1 ; \
         else \
            echo "***"; \
            echo "*** To build this program, you must run"; \
@@ -83,7 +81,7 @@ error:
            echo "***"; \
            echo -n "*** Shall I do this for you now? (y/n) "; \
            read answer; \
-           if [ $$answer = "y" ]; then \
+           if [ "$$answer" = "y" ]; then \
                autoheader && autoconf && ./configure || exit 1; \
                if $(GNU_MAKE_CMD) -v |grep GNU >/dev/null 2>/dev/null; then \
                   $(GNU_MAKE_CMD) ;\
@@ -91,6 +89,7 @@ error:
                   $(MAKE_CMD) ;\
                else \
                   echo "Neither 'make' nor 'gmake' are GNU compatible!" ; \
+                  echo "Please read INSTALL." ; \
                   exit 1 ; \
                fi ;\
            fi; \
@@ -98,7 +97,6 @@ error:
 
 .PHONY: error
 
-
 #############################################################################
 
 ## Local Variables: