add a program to turn git log output into a change log

[privoxy.git] / Makefile

diff --git a/Makefile b/Makefile
index 0fd80d5..3189c5e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,3 @@
-# $Id: Makefile,v 1.6 2002/09/05 14:35:17 oes Exp $
-#
 # Written by and Copyright (C) 2001 the SourceForge
 # Privoxy team. http://www.privoxy.org/
 #
@@ -25,36 +23,30 @@
 # or write to the Free Software Foundation, Inc., 59
 # Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
-# $Log: Makefile,v $
-# Revision 1.6  2002/09/05 14:35:17  oes
-# Change make to gmake to fix auto-build on Solaris
-#
-# Revision 1.5  2002/04/11 12:51:34  oes
-# Bugfix
-#
-# Revision 1.4  2002/04/09 16:38:10  oes
-# Added option to run the whole build process
-#
-# Revision 1.3  2002/03/26 22:29:54  swa
-# we have a new homepage!
-#
-# Revision 1.2  2002/03/24 13:25:42  swa
-# name change related issues
-#
-# Revision 1.1  2001/12/01 11:24:29  jongfoster
-# Will display a warning if non-GNU make is used
-#
-#
-
 #############################################################################
 
+GNU_MAKE_CMD = gmake
+MAKE_CMD     = make
+
 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 \
+           echo "***"; \
+           echo "*** You are not using GNU Make on Solaris, please make sure you do" ; \
+           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"; \
@@ -62,13 +54,17 @@ error:
            echo "***"; \
            echo -n "*** Shall I do this for you now? (y/n) "; \
            read answer; \
-           if [ $$answer = "y" ]; then \
-              autoheader && autoconf && ./configure || exit 1; \
-                       if which gmake >/dev/null 2>/dev/null ; then \
-                          gmake ;\
-                       else \
-                          make ;\
-                       fi ;\
+           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) ;\
+               elif $(MAKE_CMD) -v |grep GNU >/dev/null 2>/dev/null; then \
+                  $(MAKE_CMD) ;\
+               else \
+                  echo "Neither 'make' nor 'gmake' are GNU compatible!" ; \
+                  echo "Please read INSTALL." ; \
+                  exit 1 ; \
+               fi ;\
            fi; \
         fi