--- libmng-1.0.10/contrib/gcc/gtk-mng-view/Makefile

+++ libmng-1.0.10/contrib/gcc/gtk-mng-view/Makefile

@@ -2,7 +2,7 @@ LIBMNG_PREFIX = /usr/local

 CC = gcc

-CFLAGS = -g -O2 -Wall \

+CFLAGS = $(RPM_OPT_FLAGS) -g -O2 -Wall \

 	`pkg-config --cflags gtk+-2.0` \

 	-I$(LIBMNG_PREFIX)/include

--- libmng-1.0.10/contrib/gcc/gtk-mng-view/dummy.c

+++ libmng-1.0.10/contrib/gcc/gtk-mng-view/dummy.c

@@ -58,7 +58,7 @@ main (int argc, char ** argv)

   if (argc < 2)

     {

-      g_print ("Usage:  %s <file.mng>\n\n", argv[0]);

+      g_print ("Usage:  %s <file.mng>\n\n", program_invocation_short_name);

       g_print ("   Compiled with GTK+ %d.%d.%d; using GTK+ %d.%d.%d.\n",

         GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,

--- libmng-1.0.10/contrib/gcc/sdl-mngplay/mngplay.c

+++ libmng-1.0.10/contrib/gcc/sdl-mngplay/mngplay.c

@@ -26,6 +26,7 @@

 #include <stdio.h>

 #include <stdlib.h>

+#include <errno.h>

 #include <SDL/SDL.h>

 #include <libmng.h>

@@ -386,7 +387,7 @@ int main(int argc, char *argv[])

 	if (argc < 2) {

 		const SDL_version *pSDLver = SDL_Linked_Version();

-		fprintf(stderr, "Usage:  %s mngfile [depth]\n\n", basename(argv[0]));

+		fprintf(stderr, "Usage:  %s mngfile [depth]\n\n", program_invocation_short_name);

 		fprintf(stderr, "        where 'depth' is 15,16,24 or 32\n");

 		fprintf(stderr,

 			"  Compiled with SDL %d.%d.%d; using SDL %d.%d.%d.\n",

--- libmng-1.0.10/contrib/gcc/xmngview/Makefile

+++ libmng-1.0.10/contrib/gcc/xmngview/Makefile

@@ -1,9 +1,9 @@

 PROC=athlon

-CFLAGS=-g -Wall -O2 -march=$(PROC) -mcpu=$(PROC)

+CFLAGS=$(RPM_OPT_FLAGS)

 MOTIFLIB=/usr/local/lesstif/lib

 MOTIFINC=/usr/local/lesstif/include

 MNGLIB=-lmng

-LIBS=-L/usr/X11R6/lib -L$(MOTIFLIB) -lXm -lXt -lX11 $(MNGLIB) -lm

+LIBS=$(X11LIBDIR) -L$(MOTIFLIB) -lXm -lXt -lX11 $(MNGLIB) -lm

 INC=-I/usr/X11R6/include -I$(MOTIFINC)

 CC=gcc

 LDFLAGS=