Blob Blame History Raw
diff -up mpage-2.5.6/Makefile.config mpage-2.5.6/Makefile
--- mpage-2.5.6/Makefile.config	2004-05-30 21:38:31.000000000 +0200
+++ mpage-2.5.6/Makefile	2009-03-27 11:11:14.652186064 +0100
@@ -40,7 +40,7 @@ CC=gcc
 #  See glob.c for all possibilities
 #
 # PAGESIZE=Letter
-PAGESIZE=A4
+PAGESIZE=Letter
 
 #
 # Define your spooler type
@@ -50,7 +50,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
@@ -73,7 +73,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
 
 
 ############################################################################
@@ -107,7 +107,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)
@@ -183,5 +183,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