diff -Naur libmng-1.0.8.orig/contrib/gcc/gtk-mng-view/dummy.c libmng-1.0.8/contrib/gcc/gtk-mng-view/dummy.c
--- libmng-1.0.8.orig/contrib/gcc/gtk-mng-view/dummy.c	2004-08-06 11:17:02 +0400
+++ libmng-1.0.8/contrib/gcc/gtk-mng-view/dummy.c	2004-10-05 10:24:29 +0400
@@ -46,6 +46,8 @@
   return size;
 }
 
+extern const char *__progname;
+
 int
 main (int argc, char ** argv)
 {
@@ -58,7 +60,7 @@
 
   if (argc < 2)
     {
-      g_print ("Usage:  %s <file.mng>\n\n", argv[0]);
+      g_print ("Usage:  %s <file.mng>\n\n", __progname);
 
       g_print ("   Compiled with GTK+ %d.%d.%d; using GTK+ %d.%d.%d.\n",
         GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION,
diff -Naur libmng-1.0.8.orig/contrib/gcc/gtk-mng-view/Makefile libmng-1.0.8/contrib/gcc/gtk-mng-view/Makefile
--- libmng-1.0.8.orig/contrib/gcc/gtk-mng-view/Makefile	2004-08-06 11:17:03 +0400
+++ libmng-1.0.8/contrib/gcc/gtk-mng-view/Makefile	2004-10-05 10:24:55 +0400
@@ -2,7 +2,7 @@
 
 CC = gcc
 
-CFLAGS = -g -O2 -Wall \
+CFLAGS = $(RPM_OPT_FLAGS) -g -O2 -Wall \
 	`pkg-config --cflags gtk+-2.0` \
 	-I$(LIBMNG_PREFIX)/include
 
diff -Naur libmng-1.0.8.orig/contrib/gcc/sdl-mngplay/archived/mngplay.c libmng-1.0.8/contrib/gcc/sdl-mngplay/archived/mngplay.c
--- libmng-1.0.8.orig/contrib/gcc/sdl-mngplay/archived/mngplay.c	2004-08-06 11:17:07 +0400
+++ libmng-1.0.8/contrib/gcc/sdl-mngplay/archived/mngplay.c	2004-10-05 10:24:15 +0400
@@ -294,6 +294,8 @@
 	return 0;   /* GRR ADDED:  non-void function */
 }
 
+extern const char *__progname;
+
 int main(int argc, char *argv[])
 {
 	mngstuff	*mymng;
@@ -303,7 +305,7 @@
 	if (argc < 2) {
 		const SDL_version *pSDLver = SDL_Linked_Version();
 
-		fprintf(stderr, "Usage:  %s <mngfile>\n\n", argv[0]);
+		fprintf(stderr, "Usage:  %s <mngfile>\n\n", __progname);
 		fprintf(stderr,
 			"  Compiled with SDL %d.%d.%d; using SDL %d.%d.%d.\n",
 			SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL,
diff -Naur libmng-1.0.8.orig/contrib/gcc/sdl-mngplay/mngplay.c libmng-1.0.8/contrib/gcc/sdl-mngplay/mngplay.c
--- libmng-1.0.8.orig/contrib/gcc/sdl-mngplay/mngplay.c	2004-08-06 11:17:10 +0400
+++ libmng-1.0.8/contrib/gcc/sdl-mngplay/mngplay.c	2004-10-05 10:23:59 +0400
@@ -377,6 +377,8 @@
 	return 0;   /* GRR ADDED:  non-void function */
 }
 
+extern const char *__progname;
+
 int main(int argc, char *argv[])
 {
 	mngstuff	*mymng;
@@ -386,7 +388,7 @@
 	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", __progname);
 		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",
diff -Naur libmng-1.0.8.orig/contrib/gcc/xmngview/Makefile libmng-1.0.8/contrib/gcc/xmngview/Makefile
--- libmng-1.0.8.orig/contrib/gcc/xmngview/Makefile	2004-08-06 11:17:12 +0400
+++ libmng-1.0.8/contrib/gcc/xmngview/Makefile	2004-10-05 10:25:21 +0400
@@ -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=