File xmbase-grok-1.5.diff of Package xmbase-grok

Overview Repositories Revisions Requests Users Attributes Meta

File xmbase-grok-1.5.diff of Package xmbase-grok

--- src/Makefile
+++ src/Makefile
@@ -3,15 +3,15 @@
 # xmkmf and/or imake. Otherwise, run "xmkmf" and "make".
 #
 
-GBIN = /usr/local/bin
-GLIB = /usr/local/lib
+GBIN = /usr/bin
+GLIB = /usr/lib/grok
 
 #DEBUG = -g
-DEBUG = -O2 -s
+DEBUG = $(RPM_OPT_FLAGS)
 
 SGI5_C	= -DSYSV -DSVR4 -wlint -woff 813,827,852,819,826,822
 SGI6_C	= -DSYSV -DSVR4 -woff 1185 -n32
-LINUX_C	= -I/usr/X11/include
+LINUX_C	= -I/usr/X11R6/include
 HP_C	= -Aa -I/usr/include/Motif1.2 -I/usr/include/X11R5 -I/usr/include\
 	  -D_INCLUDE_HPUX_SOURCE -D_INCLUDE_POSIX_SOURCE -D_INCLUDE_XOPEN_SOURCE
 IBM_C	= -I/usr/include/X11 -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_ANSI_C_SOURCE
@@ -37,7 +37,7 @@
 #
 SGI5_L	= -lXm_s -lXt_s -lX11_s -lPW -lm
 SGI6_L	= -lXm -lXt -lX11 -lPW -lm
-LINUX_L	= -L/usr/X11R6/lib -lXm -lXt -lX11 -lm
+LINUX_L	= -L$(XLIBDIR) -lXm -lXt -lX11 -lm
 HP_L	= -L/usr/lib/X11R5 -L/usr/lib/Motif1.2 -lXm -lXt -lX11 -lc -lm
 IBM_L	= -lXm -lXt -lX11 -lPW -lm
 OSF_L	= -lXm -lXt -lX11 -lm
@@ -226,14 +226,13 @@
 
 #---------------------------------------------------------------
 install:
-	-test -d $(GLIB)/demo || mkdir -p $(GLIB)/demo
-	cp grok $(GBIN)
-	cp ../misc/grok.hlp $(GLIB)
-	cp ../demo/* ../doc/* $(GLIB)/grokdir
-	-strip $(GBIN)/grok
-	-chmod 755 $(GBIN)/grok
-	-chmod 644 $(GLIB)/grok.hlp
-	-test -d ~/.grok || (mkdir $$HOME/.grok; cp ../demo/?* $$HOME/.grok)
+	install -d -m 755 $(DESTDIR)$(GLIB)/grokdir
+	install -d -m 755 $(DESTDIR)$(GBIN)
+	cp grok $(DESTDIR)$(GBIN)
+	cp ../misc/grok.hlp $(DESTDIR)$(GLIB)
+	cp -a ../demo/* $(DESTDIR)$(GLIB)/grokdir
+	-chmod 755 $(DESTDIR)$(GBIN)/grok
+	-chmod 644 $(DESTDIR)$(GLIB)/grok.hlp
 
 clean:
 	-rm -f *.o y.tab.h y.tab.c lex.yy.c core grok tags y.output *.shar*
--- src/dbfile.c
+++ src/dbfile.c
@@ -5,6 +5,7 @@
  *	read_dbase(form, path)		read dbase into empty dbase struct
  */
 
+#include <errno.h>
 #include <X11/Xos.h>
 #include <stdio.h>
 #include <stdlib.h>
--- src/help.c
+++ src/help.c
@@ -165,7 +165,7 @@
 	XtSetArg(args[n], XmNpendingDelete,	False);			n++;
 	text_w = w = XmCreateScrolledText(form, "text", args, n);
 	XmTextSetString(w, message);
-	XtVaSetValues(w, XmNbackground, color[COL_SHEET],
+	XtVaSetValues(w, XmNbackground, color[COL_BACK],
 			 XmNforeground, color[COL_STD], NULL);
 	XtManageChild(w);
 	XtAddCallback(w, XmNhelpCallback,

Places

File xmbase-grok-1.5.diff of Package xmbase-grok

Places