Use $(MAKE) on the irix targets, instead of hard-coding pmake,

as suggested in SF bug 482149.  People can still use
pmake -v -f Makefile.X11 if they want to use pmake (works great for me).
Sorry, this should have been in the last check-in.

diff --git a/Make-config b/Make-config
index 4d61956faf364d22fd47c5c67f250300c336d5a5..03ae5081b2a94c94e18267d6648ac1c76dbf06bf 100644 (file)
--- a/Make-config
+++ b/Make-config
@@ -1,4 +1,4 @@
-# $Id: Make-config,v 1.56 2001/12/14 16:42:23 kschultz Exp $
+# $Id: Make-config,v 1.57 2001/12/14 17:48:19 kschultz Exp $
 
 MESA_MAJOR=4
 MESA_MINOR=1
@@ -363,7 +363,7 @@ hpux10-gcc-sl:
 
 # For IRIX 4: don't use -fullwarn because it causes too much garbage
 irix4:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
@@ -376,7 +376,7 @@ irix4:
 
 # On IRIX 5.3 -sopt causes a problem in drawpixels.c so we don't use it
 irix5:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
@@ -404,7 +404,7 @@ irix5-gcc:
 
 # IRIX 5 using Dynamic Shared Objects (DSO)
 irix5-dso:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
@@ -422,9 +422,9 @@ irix5-dso:
 #      C++
 #      3262:   The variable "" was declared but never referenced.
 #      3666:   The variable "" is set but never used.
-#      Use -v on pmake to compile files in subdirectories.
+#      Use -v if using pmake to compile files in subdirectories.
 irix6-o32:
-       pmake -v $(MFLAGS) -f Makefile.X11 targets \
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
@@ -439,7 +439,7 @@ irix6-o32:
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-o32-dso:
-       pmake -v $(MFLAGS) -f Makefile.X11 targets \
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
@@ -454,7 +454,7 @@ irix6-o32-dso:
        "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-n32:
-       pmake -v $(MFLAGS) -f Makefile.X11 targets \
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
@@ -469,7 +469,7 @@ irix6-n32:
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-n32-dso:
-       pmake -v $(MFLAGS) -f Makefile.X11 targets \
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
@@ -507,7 +507,7 @@ irix6-gcc-n32-sl:
 #   1474 - declaring a void parameter list with a typedef is nonstandard
 #   1552 - variable was set but never used
 irix6-64:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
@@ -520,7 +520,7 @@ irix6-64:
        "APP_LIB_DEPS = -lX11 -lXext -lXmu -lXi -lm"
 
 irix6-64-dso:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.so" \
        "GLU_LIB = libGLU.so" \
        "GLUT_LIB = libglut.so" \
@@ -1453,7 +1453,7 @@ vistra:
 # -woff 1521 = "nonstandard preprocessing directive is used"
 # -woff 3496 = "bitwise operator precedence"
 irix-debug:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \
@@ -1466,7 +1466,7 @@ irix-debug:
        "APP_LIB_DEPS = -rpath ../lib32 -lX11 -lXext -lXmu -lXi -lfpe -lXext -lXmu -lXi -lm"
 
 DEBUG:
-       pmake $(MFLAGS) -f Makefile.X11 targets \
+       $(MAKE) $(MFLAGS) -f Makefile.X11 targets \
        "GL_LIB = libGL.a" \
        "GLU_LIB = libGLU.a" \
        "GLUT_LIB = libglut.a" \