diff -NarU5 xv-3.10a.orig/Makefile xv-3.10a/Makefile
--- xv-3.10a.orig/Makefile	2007-12-09 13:31:39.000000000 -0500
+++ xv-3.10a/Makefile	2007-12-14 22:36:46.000000000 -0500
@@ -16,11 +16,11 @@
 #       -Wstrict-prototypes -Waggregate-return -Wconversion \
 #       -Wpointer-arith -Wcomment -Wformat -Wchar-subscripts \
 #       -Wuninitialized -Wparentheses
 
 
-CCOPTS = -O
+CCOPTS = $(RPM_OPT_FLAGS)
 #
 # these are the usual optimization and warning options for gcc; all such
 # warnings but one (mktemp() use) have been eliminated (at least on Linux):
 #CCOPTS = -O3 -Wall
 #
@@ -54,11 +54,11 @@
 
 ### Installation locations
 ### NOTE: Users of old K&R compilers (i.e., any version not supporting C89
 ### string concatenation, such as "fub" "ar" => "fubar") should update
 ### xvtext.c:1831 (or thereabouts) if either PREFIX or DOCDIR changes:
-PREFIX = /usr/local
+PREFIX = /usr
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/share/man/man1
 MANSUF = 1
 DOCDIR = $(PREFIX)/share/doc/xv
 LIBDIR = $(PREFIX)/lib/xv
@@ -177,17 +177,17 @@
 ### to compile on your machine, *COMMENT OUT* the following lines
 ###
 JP2K    = -DDOJP2K
 ###
 #JP2KDIR = ../../jasper
-JP2KDIR = /usr/local/lib
+JP2KDIR = /usr/lib
 ###
 #JP2KINC = -I$(JP2KDIR)
-JP2KINC = -I/usr/local/include
+#JP2KINC = -I/usr/local/include
 ###
-#JP2KLIB = -L$(JP2KDIR) -ljasper
-JP2KLIB = $(JP2KDIR)/libjasper.a
+JP2KLIB = -L$(JP2KDIR) -ljasper
+#JP2KLIB = $(JP2KDIR)/libjasper.a
 
 
 ###
 ### if, for whatever reason, you're unable to get the PDS/VICAR support
 ### to compile (xvpds.c, and vdcomp.c), *COMMENT OUT* the following line,
@@ -415,14 +415,14 @@
 	  $(DESTDIR)$(MANDIR)/bggen.$(MANSUF) \
 	  $(DESTDIR)$(MANDIR)/xcmap.$(MANSUF) \
 	  $(DESTDIR)$(MANDIR)/xvpictoppm.$(MANSUF) \
 	  $(DESTDIR)$(MANDIR)/vdcomp.$(MANSUF)
 #
-	$(MKDIR) $(DESTDIR)$(DOCDIR)		# or $(DESTDIR)$(LIBDIR)
-	cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
-	chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
-	  $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
+#	$(MKDIR) $(DESTDIR)$(DOCDIR)		# or $(DESTDIR)$(LIBDIR)
+#	cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
+#	chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
+#	  $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
 #
 	#$(MKDIR) $(DESTDIR)$(SYSCONFDIR)
 	#cp xv_mgcsfx.sample $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx
 	#chmod 644 $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx
 
diff -NarU5 xv-3.10a.orig/Makefile.std xv-3.10a/Makefile.std
--- xv-3.10a.orig/Makefile.std	2007-12-09 13:31:39.000000000 -0500
+++ xv-3.10a/Makefile.std	2007-12-14 22:34:22.000000000 -0500
@@ -16,11 +16,11 @@
 #       -Wstrict-prototypes -Waggregate-return -Wconversion \
 #       -Wpointer-arith -Wcomment -Wformat -Wchar-subscripts \
 #       -Wuninitialized -Wparentheses
 
 
-CCOPTS = -O
+CCOPTS = $(RPM_OPT_FLAGS)
 #
 # these are the usual optimization and warning options for gcc; all such
 # warnings but one (mktemp() use) have been eliminated (at least on Linux):
 #CCOPTS = -O3 -Wall
 #
@@ -54,11 +54,11 @@
 
 ### Installation locations
 ### NOTE: Users of old K&R compilers (i.e., any version not supporting C89
 ### string concatenation, such as "fub" "ar" => "fubar") should update
 ### xvtext.c:1831 (or thereabouts) if either PREFIX or DOCDIR changes:
-PREFIX = /usr/local
+PREFIX = /usr
 BINDIR = $(PREFIX)/bin
 MANDIR = $(PREFIX)/share/man/man1
 MANSUF = 1
 DOCDIR = $(PREFIX)/share/doc/xv
 LIBDIR = $(PREFIX)/lib/xv
@@ -177,17 +177,17 @@
 ### to compile on your machine, *COMMENT OUT* the following lines
 ###
 JP2K    = -DDOJP2K
 ###
 #JP2KDIR = ../../jasper
-JP2KDIR = /usr/local/lib
+JP2KDIR = /usr/lib
 ###
 #JP2KINC = -I$(JP2KDIR)
-JP2KINC = -I/usr/local/include
+#JP2KINC = -I/usr/local/include
 ###
-#JP2KLIB = -L$(JP2KDIR) -ljasper
-JP2KLIB = $(JP2KDIR)/libjasper.a
+JP2KLIB = -L$(JP2KDIR) -ljasper
+#JP2KLIB = $(JP2KDIR)/libjasper.a
 
 
 ###
 ### if, for whatever reason, you're unable to get the PDS/VICAR support
 ### to compile (xvpds.c, and vdcomp.c), *COMMENT OUT* the following line,
@@ -415,14 +415,14 @@
 	  $(DESTDIR)$(MANDIR)/bggen.$(MANSUF) \
 	  $(DESTDIR)$(MANDIR)/xcmap.$(MANSUF) \
 	  $(DESTDIR)$(MANDIR)/xvpictoppm.$(MANSUF) \
 	  $(DESTDIR)$(MANDIR)/vdcomp.$(MANSUF)
 #
-	$(MKDIR) $(DESTDIR)$(DOCDIR)		# or $(DESTDIR)$(LIBDIR)
-	cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
-	chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
-	  $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
+#	$(MKDIR) $(DESTDIR)$(DOCDIR)		# or $(DESTDIR)$(LIBDIR)
+#	cp README.jumbo docs/xvdocs.pdf docs/xvdocs.ps $(DESTDIR)$(DOCDIR)/.
+#	chmod 644 $(DESTDIR)$(DOCDIR)/README.jumbo \
+#	  $(DESTDIR)$(DOCDIR)/xvdocs.pdf $(DESTDIR)$(DOCDIR)/xvdocs.ps
 #
 	#$(MKDIR) $(DESTDIR)$(SYSCONFDIR)
 	#cp xv_mgcsfx.sample $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx
 	#chmod 644 $(DESTDIR)$(SYSCONFDIR)/xv_mgcsfx