File XBanner1.31.dif of Package xbanner

--- Imakefile
+++ Imakefile
@@ -6,7 +6,7 @@
 
 XCOMM Install directory:
 
-LOCALBINDIR=/usr/X11/bin
+LOCALBINDIR=/usr/bin
 ETCDIR=/etc/X11/xdm
 
 XCOMM ***** No need to touch anything below this! *****
@@ -17,12 +17,13 @@
 DEFINES=-DHAS_XPM
 
 AllTarget($(PROGRAMS))
-SingleProgramTarget(xbanner, backg.o colors.o effect.o linger.o pix.o plasma.o ripples.o util.o xbanner.o xres.o , /**/ , -lXpm -lX11 -lm )
-SingleProgramTarget(freetemp, freetemp.o util.o , /**/ , -lX11 )
-SingleProgramTarget(xb_check, xb_check.o , /**/ , /**/ )
-SingleProgramTarget(random_effect, random_effect.o , /**/ , /**/ )
+SingleProgramTarget(xbanner,backg.o colors.o effect.o linger.o pix.o plasma.o ripples.o util.o xbanner.o xres.o,/**/,-lXpm -lX11 -lm )
+SingleProgramTarget(freetemp,freetemp.o util.o,/**/,-lX11)
+SingleProgramTarget(xb_check,xb_check.o,/**/,/**/)
+SingleProgramTarget(random_effect,random_effect.o,/**/,/**/)
 
 XCOMM Install directives
-InstallTarget(install,xbanner, --strip --mode "0755" --owner root --group bin , $(LOCALBINDIR))
-InstallTarget(install,freetemp, --strip --mode "0755" --owner root --group bin , $(LOCALBINDIR))
-InstallTarget(install,xb_check, --strip --mode "0755" --owner root --group bin , $(LOCALBINDIR))
+InstallTarget(install,xbanner,--mode "0755",$(LOCALBINDIR))
+InstallTarget(install,freetemp,--mode "0755",$(LOCALBINDIR))
+InstallTarget(install,xb_check,--mode "0755",$(LOCALBINDIR))
+InstallTarget(install,random_effect,--mode "0755",$(LOCALBINDIR))
--- samples/Demo/Coin
+++ samples/Demo/Coin
@@ -7,7 +7,7 @@
 xbanner.foreground:	#FFA501
 xbanner.hiColor:	yellow
 xbanner.label:		X B a n n e r !
-xbanner.pixFile:	../../Logo_32_col.xpm
+xbanner.pixFile:	../Logo_32_col.xpm
 xbanner.pixmapX:	500
 xbanner.pixmapY:	250
 xbanner.placement:	TopCenter
--- samples/Demo/Shake
+++ samples/Demo/Shake
@@ -1,4 +1,4 @@
-xbanner.bgPixFile:	../../Logo_32_col.xpm
+xbanner.bgPixFile:	../Logo_32_col.xpm
 xbanner.bgStyle:	BgPix
 xbanner.effect:		Shake
 xbanner.font:		-adobe-utopia-bold-i-normal--200-*-100-100-*-*-iso8859-1
--- samples/Demo/StandOut2_2
+++ samples/Demo/StandOut2_2
@@ -8,7 +8,7 @@
 xbanner.thickness:	4
 xbanner.y:		140
 xbanner.doPixmap:	True
-xbanner.pixFile:	../../Logo.xpm
+xbanner.pixFile:	../Logo.xpm
 xbanner.pixmapX:	500
 xbanner.pixmapY:	280
 xbanner.glint:		True
--- xres.c
+++ xres.c
@@ -1196,9 +1196,15 @@
   /* get the app-defaults */
 
 #ifndef vms
-  strcpy(line,"/usr/lib/X11/app-defaults/");
+  strcpy(line,"/usr/share/X11/app-defaults/");
   strcat(line,PRGCLASS);
   appdefDB = XrmGetFileDatabase(line);
+  if (appdefDB==NULL)
+  {
+    strcpy(line,"/usr/lib/X11/app-defaults/");
+    strcat(line,PRGCLASS);
+    appdefDB = XrmGetFileDatabase(line);
+  }
   if(appdefDB==NULL && getenv("XAPPLRESDIR")!=NULL)
   {
     strcpy(line,getenv("XAPPLRESDIR"));