mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-12 20:16:49 +02:00
9e08985ed8
- Update mpage from 2.5.6 to 2.5.7 - No change to rootfile - Slight tuning of patch needed due to changes in source file - Changelog June 2017 - Released version 2.5.7 - Relicensed code under GPLv2 or later Signed-off-by: Adolf Belka <adolf.belka@ipfire.org> Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
diff -aup mpage-2.5.7/Makefile.orig mpage-2.5.7/Makefile
|
|
--- mpage-2.5.7/Makefile.orig 2017-06-28 10:07:41.000000000 +0200
|
|
+++ mpage-2.5.7/Makefile 2021-02-08 13:35:23.219223469 +0100
|
|
@@ -48,7 +48,7 @@ CC=gcc
|
|
# See glob.c for all possibilities
|
|
#
|
|
# PAGESIZE=Letter
|
|
-PAGESIZE=A4
|
|
+PAGESIZE=Letter
|
|
|
|
#
|
|
# Define your spooler type
|
|
@@ -58,7 +58,7 @@ PAGESIZE=A4
|
|
SPOOL_TYPE=BSD_SPOOLER
|
|
|
|
# PREFIX=e:/usr # OS/2 type
|
|
-PREFIX=/usr/local
|
|
+PREFIX=/usr
|
|
#PREFIX=/usr
|
|
BINDIR=$(PREFIX)/bin
|
|
LIBDIR=$(PREFIX)/share
|
|
@@ -81,7 +81,7 @@ SHEETMARGIN=18
|
|
#
|
|
DEFAULT_DUPLEX=0
|
|
|
|
-DEFS = -DPAGE_DEF=\"${PAGESIZE}\" -DLIBDIR=\"${LIBDIR}/mpage\" -DDEFAULT_ENCODING=${ENCODING} -DDEFAULT_DUPLEX=${DEFAULT_DUPLEX} -DDEFAULTSMARGIN=${SHEETMARGIN} -DSPOOLER=${SPOOL_TYPE} # -DKANJI
|
|
+DEFS = -DPAGE_DEF=\"${PAGESIZE}\" -DLIBDIR=\"${LIBDIR}/mpage\" -DDEFAULT_ENCODING=${ENCODING} -DDEFAULT_DUPLEX=${DEFAULT_DUPLEX} -DDEFAULTSMARGIN=${SHEETMARGIN} -DSPOOLER=${SPOOL_TYPE} -DKANJI
|
|
|
|
|
|
############################################################################
|
|
@@ -115,7 +115,7 @@ O = .o
|
|
# If you are using gcc, you probably don't need to change anything here.
|
|
|
|
# Linux:
|
|
-CFLAGS = -O2 -s $(DEFS) -Wall
|
|
+CFLAGS = $(RPM_OPT_FLAGS) $(DEFS) -Wall
|
|
|
|
# AIX (xlC on aix 4):
|
|
#CFLAGS = -O2 -s $(DEFS)
|
|
@@ -191,5 +191,4 @@ install:
|
|
if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi
|
|
cp mpage$(E) $(BINDIR)
|
|
cp mpage.1 $(MANDIR)
|
|
- -cp Encodings/* $(LIBDIR)/mpage
|
|
- -chmod 644 $(LIBDIR)/mpage/*
|
|
+ install -p -m 644 Encodings/* $(LIBDIR)/mpage
|