--- Makefile.orig	Wed Jul 29 21:42:13 1998
+++ Makefile	Wed Jul 29 21:42:24 1998
@@ -45,11 +45,14 @@
 #  Default locations where mp files will be installed.
 #  You might wish to alter these values.
 #
-MPPATH     = /usr/local
+#MPPATH     = /usr/local
+MPPATH     = $(PREFIX)
 MPBINDIR   = $(MPPATH)/bin
-MPLIBDIR   = $(MPPATH)/lib
+#MPLIBDIR   = $(MPPATH)/lib
+MPLIBDIR   = $(MPPATH)/share/mp
 MPMANDIR   = $(MPPATH)/man/man$(MPMANSECT)
-MPMANSECT  = l
+#MPMANSECT  = l
+MPMANSECT  = 1
 #---------------------------------------------------------------------
 #  Alternate names for the mailp frontend
 #
@@ -58,11 +61,13 @@
 #  Compilation flags and standard macro definitions.
 #
 CDEFS	 = $(GECOSFIELDS) $(GECOSLENGTH) $(PROLOGUE)
-CCOMP	 = -O
+CXXFLAGS ?= $(CFLAGS)
+CCOMP	 := $(CXXFLAGS)
 CCFLAGS  = $(CCOMP) $(CDEFS)
 LDFLAGS  =
 
-CCC	 = g++
+CXXFLAGS = $(CCFLAGS)	# needed for gmake's implicit rule
+CCC	=	$(CXX)
 #=================================================================
 
 .KEEPSTATE:
@@ -107,10 +112,10 @@
 	   @echo "**IMPORTANT NOTE**"
 	   @echo
 	   @echo "Mp is setup by default to work with US Letter sized paper."
-	   @echo "If you are using A4 sized paper, you should reinstall, by
+	   @echo "If you are using A4 sized paper, you should reinstall, by"
 	   @echo "doing a:"
 	   @echo
-	   @echo "make install-a4"
+	   @echo "make PAPERSIZE=a4 reinstall"
 	   @echo
 
 common-install: $(BINARIES)
@@ -122,6 +127,8 @@
 	   -cp mp.1 $(MPMANDIR)/mp.$(MPMANSECT)
 	   -chmod 644 $(MPMANDIR)/mp.$(MPMANSECT)
 #                                                     mp.common.ps
+	   -mkdir $(MPLIBDIR)
+#
 	   -cp mp.common.ps $(MPLIBDIR)
 	   -chmod 644 $(MPLIBDIR)/mp.common.ps
 #                                                     mp.pro.ps