diff options
| author | David E. O'Brien <obrien@FreeBSD.org> | 1998-07-30 04:36:46 +0000 |
|---|---|---|
| committer | David E. O'Brien <obrien@FreeBSD.org> | 1998-07-30 04:36:46 +0000 |
| commit | af00fa495916d27b6c660bd317e5df5f1b3a4deb (patch) | |
| tree | 52c8b0126548042f9dde1a7943408b160f327895 /print | |
| parent | PR: 6078 (diff) | |
Doesn't require GMAKE anymore.
Respect CXX and CFLAGS.
Submitted by: Mikhail Teterin <mi@aldan.algebra.com>
Notes
Notes:
svn path=/head/; revision=12206
Diffstat (limited to 'print')
| -rw-r--r-- | print/mp-letter/Makefile | 3 | ||||
| -rw-r--r-- | print/mp-letter/files/patch-aa | 20 |
2 files changed, 15 insertions, 8 deletions
diff --git a/print/mp-letter/Makefile b/print/mp-letter/Makefile index e4f71dd42d8b..e336099b6a35 100644 --- a/print/mp-letter/Makefile +++ b/print/mp-letter/Makefile @@ -3,7 +3,7 @@ # Date created: 11 July 1996 # Whom: David O'Brien <obrien@cs.ucdavis.edu> # -# $Id: Makefile,v 1.5 1997/10/10 06:53:32 obrien Exp $ +# $Id: Makefile,v 1.6 1997/11/10 11:23:29 asami Exp $ # DISTNAME= mp-3.0.1 @@ -16,7 +16,6 @@ MAINTAINER= obrien@FreeBSD.org MANUAL_PACKAGE_BUILD= PAPERSIZE has to be set to letter a4 WRKSRC= ${WRKDIR}/mp -USE_GMAKE= yes MAN1= mp.1 .if !defined(PAPERSIZE) diff --git a/print/mp-letter/files/patch-aa b/print/mp-letter/files/patch-aa index 4cd59e2e7d5f..f434eadc849f 100644 --- a/print/mp-letter/files/patch-aa +++ b/print/mp-letter/files/patch-aa @@ -1,5 +1,5 @@ ---- Makefile.orig Sat Aug 10 02:48:14 1996 -+++ Makefile Sat Aug 10 02:53:07 1996 +--- Makefile.orig Wed Jul 29 21:33:32 1998 ++++ Makefile Wed Jul 29 21:35:09 1998 @@ -45,11 +45,14 @@ # Default locations where mp files will be installed. # You might wish to alter these values. @@ -18,15 +18,23 @@ #--------------------------------------------------------------------- # Alternate names for the mailp frontend # -@@ -62,6 +65,7 @@ +@@ -58,11 +61,13 @@ + # Compilation flags and standard macro definitions. + # + CDEFS = $(GECOSFIELDS) $(GECOSLENGTH) $(PROLOGUE) +-CCOMP = -O ++#CCOMP = -l ++CCOMP = $(CFLAGS) CCFLAGS = $(CCOMP) $(CDEFS) LDFLAGS = +-CCC = g++ +CXXFLAGS = $(CCFLAGS) # needed for gmake's implicit rule - CCC = g++ ++CCC = $(CXX) #================================================================= -@@ -107,10 +111,10 @@ + .KEEPSTATE: +@@ -107,10 +112,10 @@ @echo "**IMPORTANT NOTE**" @echo @echo "Mp is setup by default to work with US Letter sized paper." @@ -39,7 +47,7 @@ @echo common-install: $(BINARIES) -@@ -122,6 +126,8 @@ +@@ -122,6 +127,8 @@ -cp mp.1 $(MPMANDIR)/mp.$(MPMANSECT) -chmod 644 $(MPMANDIR)/mp.$(MPMANSECT) # mp.common.ps |