2021-03-14 09:40:46 +01:00
|
|
|
$NetBSD: patch-aa,v 1.7 2021/03/14 08:40:46 wiz Exp $
|
1998-08-07 13:08:53 +02:00
|
|
|
|
2021-03-14 09:40:46 +01:00
|
|
|
Fix build.
|
|
|
|
|
|
|
|
--- Makefile.orig 2017-06-28 08:07:41.000000000 +0000
|
|
|
|
+++ Makefile
|
|
|
|
@@ -32,7 +32,6 @@
|
1998-04-01 22:57:18 +02:00
|
|
|
# Set this to an ANSI compatible C compiler (preferably gcc)
|
|
|
|
# See also system specific settings below
|
|
|
|
#CC=cc
|
|
|
|
-CC=gcc
|
|
|
|
|
|
|
|
############################################################################
|
|
|
|
#
|
2021-03-14 09:40:46 +01:00
|
|
|
@@ -48,7 +47,7 @@ CC=gcc
|
2007-03-17 02:11:22 +01:00
|
|
|
# See glob.c for all possibilities
|
2002-02-16 02:21:52 +01:00
|
|
|
#
|
2007-03-17 02:11:22 +01:00
|
|
|
# PAGESIZE=Letter
|
|
|
|
-PAGESIZE=A4
|
|
|
|
+#PAGESIZE=A4
|
2002-02-16 02:21:52 +01:00
|
|
|
|
|
|
|
#
|
|
|
|
# Define your spooler type
|
2021-03-14 09:40:46 +01:00
|
|
|
@@ -58,11 +57,11 @@ PAGESIZE=A4
|
1998-04-01 22:57:18 +02:00
|
|
|
SPOOL_TYPE=BSD_SPOOLER
|
|
|
|
|
|
|
|
# PREFIX=e:/usr # OS/2 type
|
|
|
|
-PREFIX=/usr/local
|
2007-03-17 02:11:22 +01:00
|
|
|
+#PREFIX=/usr/local
|
|
|
|
#PREFIX=/usr
|
1998-04-01 22:57:18 +02:00
|
|
|
BINDIR=$(PREFIX)/bin
|
2007-03-17 02:11:22 +01:00
|
|
|
LIBDIR=$(PREFIX)/share
|
2005-12-28 00:50:07 +01:00
|
|
|
-MANDIR=$(PREFIX)/man/man1
|
2007-03-17 02:11:22 +01:00
|
|
|
+#MANDIR=$(PREFIX)/man/man1
|
1998-04-01 22:57:18 +02:00
|
|
|
|
|
|
|
#
|
2005-12-28 00:50:07 +01:00
|
|
|
# A default encoding is given in encoding.h. Setting ENCODING=1 will
|
2021-03-14 09:40:46 +01:00
|
|
|
@@ -114,8 +113,8 @@ O = .o
|
2000-12-08 08:24:22 +01:00
|
|
|
# Choose one of the following CFLAGS/CC definitions:
|
|
|
|
# If you are using gcc, you probably don't need to change anything here.
|
|
|
|
|
|
|
|
-# Linux:
|
|
|
|
-CFLAGS = -O2 -s $(DEFS) -Wall
|
|
|
|
+# Linux or BSD:
|
|
|
|
+CFLAGS += -O2 -s $(DEFS) -Wall
|
|
|
|
|
|
|
|
# AIX (xlC on aix 4):
|
|
|
|
#CFLAGS = -O2 -s $(DEFS)
|
2021-03-14 09:40:46 +01:00
|
|
|
@@ -158,7 +157,7 @@ default: mpage$(E) msample$(E) mpage.1
|
|
|
|
@echo Done!
|
|
|
|
|
|
|
|
mpage$(E): $(MOBJ)
|
|
|
|
- $(CC) $(CFLAGS) -o mpage$(E) $(MOBJ) $(LIBS)
|
|
|
|
+ $(CC) $(LDFLAGS) $(CFLAGS) -o mpage$(E) $(MOBJ) $(LIBS)
|
|
|
|
|
|
|
|
msample$(E): $(SOBJ)
|
|
|
|
$(CC) $(CFLAGS) -o msample$(E) $(SOBJ) $(LIBS)
|
|
|
|
@@ -189,7 +188,6 @@ install:
|
2007-03-17 02:11:22 +01:00
|
|
|
if [ ! -d $(LIBDIR)/mpage ] ; then mkdir -p $(LIBDIR)/mpage ; fi
|
|
|
|
if [ ! -d $(BINDIR) ] ; then mkdir -p $(BINDIR) ; fi
|
|
|
|
if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi
|
1998-04-01 22:57:18 +02:00
|
|
|
- cp mpage$(E) $(BINDIR)
|
|
|
|
- cp mpage.1 $(MANDIR)
|
2007-03-17 02:11:22 +01:00
|
|
|
- -cp Encodings/* $(LIBDIR)/mpage
|
|
|
|
- -chmod 644 $(LIBDIR)/mpage/*
|
1998-04-01 22:57:18 +02:00
|
|
|
+ $(BSD_INSTALL_PROGRAM) mpage$(E) $(BINDIR)
|
|
|
|
+ $(BSD_INSTALL_MAN) mpage.1 $(MANDIR)
|
|
|
|
+ $(BSD_INSTALL_DATA) Encodings/* $(LIBDIR)/mpage
|