]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blob - src/patches/mpage25-config.patch
Merge remote-tracking branch 'origin/next' into fifteen
[people/pmueller/ipfire-2.x.git] / src / patches / mpage25-config.patch
1 diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile
2 --- mpage-2.5.6/Makefile.config 2004-05-30 21:38:31.000000000 +0200
3 +++ mpage-2.5.6/Makefile 2009-03-27 11:11:14.652186064 +0100
4 @@ -40,7 +40,7 @@ CC=gcc
5 # See glob.c for all possibilities
6 #
7 # PAGESIZE=Letter
8 -PAGESIZE=A4
9 +PAGESIZE=Letter
10
11 #
12 # Define your spooler type
13 @@ -50,7 +50,7 @@ PAGESIZE=A4
14 SPOOL_TYPE=BSD_SPOOLER
15
16 # PREFIX=e:/usr # OS/2 type
17 -PREFIX=/usr/local
18 +PREFIX=/usr
19 #PREFIX=/usr
20 BINDIR=$(PREFIX)/bin
21 LIBDIR=$(PREFIX)/share
22 @@ -73,7 +73,7 @@ SHEETMARGIN=18
23 #
24 DEFAULT_DUPLEX=0
25
26 -DEFS = -DPAGE_DEF=\"${PAGESIZE}\" -DLIBDIR=\"${LIBDIR}/mpage\" -DDEFAULT_ENCODING=${ENCODING} -DDEFAULT_DUPLEX=${DEFAULT_DUPLEX} -DDEFAULTSMARGIN=${SHEETMARGIN} -DSPOOLER=${SPOOL_TYPE} # -DKANJI
27 +DEFS = -DPAGE_DEF=\"${PAGESIZE}\" -DLIBDIR=\"${LIBDIR}/mpage\" -DDEFAULT_ENCODING=${ENCODING} -DDEFAULT_DUPLEX=${DEFAULT_DUPLEX} -DDEFAULTSMARGIN=${SHEETMARGIN} -DSPOOLER=${SPOOL_TYPE} -DKANJI
28
29
30 ############################################################################
31 @@ -107,7 +107,7 @@ O = .o
32 # If you are using gcc, you probably don't need to change anything here.
33
34 # Linux:
35 -CFLAGS = -O2 -s $(DEFS) -Wall
36 +CFLAGS = $(RPM_OPT_FLAGS) $(DEFS) -Wall
37
38 # AIX (xlC on aix 4):
39 #CFLAGS = -O2 -s $(DEFS)
40 @@ -183,5 +183,4 @@ install:
41 if [ ! -d $(MANDIR) ] ; then mkdir -p $(MANDIR) ; fi
42 cp mpage$(E) $(BINDIR)
43 cp mpage.1 $(MANDIR)
44 - -cp Encodings/* $(LIBDIR)/mpage
45 - -chmod 644 $(LIBDIR)/mpage/*
46 + install -p -m 644 Encodings/* $(LIBDIR)/mpage