Date:	Monday April 30, 2001 @ 4:34
Author:	cameron

Update of /home/netrek/cvsroot/Vanilla/gum
In directory swashbuckler.fortress.real-time.com:/var/tmp/cvs-serv20916/gum

Modified Files:
	Makefile.am Makefile.in signals.c 
Log Message:
Sun Apr 29 16:52:47 2001  Benjamin `Quisar' Lerman <quisar at quisar.ambre.net>
	
	* configure.in: put back AC_SUBST(INL) so that sysdef is correct.
	Remove the hach about INSTALL that is not necessary. Changed a few
	things about res-rsa so that it work outside the tree source.
	Move handling of with-gum so that it does not mess with INSTALL

	* system.mk.in, keycomp/Makefile.in, newstartd/Makefile.in,
	ntserv/Makefile.in, pledit/Makefile.in, robotd/Makefile.in,
	robots/Makefile.in, sequencer/Makefile.in, tools/Makefile.in,
	xsg/Makefile.in: remove OPT (CFLAGS is the way to do it), remove
	-lm which is already there with configure and remove the double
	-g.

	* gum/Makefile.am, gum/Makefile.in, gum/signals.c: gum.xpm is now
	found by gum.



****************************************

Index: Vanilla/gum/Makefile.am
diff -u Vanilla/gum/Makefile.am:1.9 Vanilla/gum/Makefile.am:1.10
--- Vanilla/gum/Makefile.am:1.9	Thu Apr 26 19:45:19 2001
+++ Vanilla/gum/Makefile.am	Mon Apr 30 04:34:35 2001
@@ -15,6 +15,8 @@
 
 gum_LDADD = @GTK_LIBS@ ../ntserv/data.o 
 
+CFLAGS = @CFLAGS@ -DPACKAGE_DATA_DIR=\"@prefix@\"
+
 install-data-local:
 	test -d ${srcdir}/pixmaps \
 	&& install -d -m 0755 $(pkgdatadir)/pixmaps \
Index: Vanilla/gum/Makefile.in
diff -u Vanilla/gum/Makefile.in:1.12 Vanilla/gum/Makefile.in:1.13
--- Vanilla/gum/Makefile.in:1.12	Thu Apr 26 19:45:19 2001
+++ Vanilla/gum/Makefile.in	Mon Apr 30 04:34:35 2001
@@ -76,6 +76,8 @@
 
 
 gum_LDADD = @GTK_LIBS@ ../ntserv/data.o 
+
+CFLAGS = @CFLAGS@ -DPACKAGE_DATA_DIR=\"@prefix@\"
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES = 
@@ -89,7 +91,6 @@
 gum_OBJECTS =  support.o main.o signals.o id.o xmalloc.o
 gum_DEPENDENCIES =  ../ntserv/data.o
 gum_LDFLAGS = 
-CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
Index: Vanilla/gum/signals.c
diff -u Vanilla/gum/signals.c:1.5 Vanilla/gum/signals.c:1.6
--- Vanilla/gum/signals.c:1.5	Thu Dec 30 00:39:58 1999
+++ Vanilla/gum/signals.c	Mon Apr 30 04:34:35 2001
@@ -54,6 +54,7 @@
 #include <stdlib.h>
 #include "main.h"
 #include "signals.h"
+#include "support.h"
 #include "../config.h"
 #include "../ntserv/defs.h"
 #include "../ntserv/struct.h"
@@ -1471,6 +1472,8 @@
   gtk_set_locale ();
   gtk_init (&argc, &argv);
 
+  add_pixmap_directory (PACKAGE_DATA_DIR "/share/gum/pixmaps");
+  
   gumopen = NULL;
   gumsaveas = NULL;
   gummotd = NULL;