utalk (1.0.1.beta-7) direct (non packaging) changes

Summary

 Makefile  |   36 +++++++++++++++++++++---------------
 termcap.h |    2 +-
 2 files changed, 22 insertions(+), 16 deletions(-)

    
download this patch

Patch contents

--- utalk-1.0.1.beta.orig/Makefile
+++ utalk-1.0.1.beta/Makefile
@@ -1,3 +1,5 @@
+DESTDIR =
+
 # Makefile for srdp/utalk - Roger Espel Llima
 
 #BINDIR = /usr/local/bin
@@ -6,9 +8,13 @@
 #BINDIR = /usr/local/util/bin
 #MANDIR = /usr/local/util/man
 #LIBDIR = /usr/local/util/lib
-BINDIR = /home/e/espel/bin
-MANDIR = /home/e/espel/man
-LIBDIR = /home/e/espel/lib
+#BINDIR = /home/e/espel/bin
+#MANDIR = /home/e/espel/man
+#LIBDIR = /home/e/espel/lib
+
+BINDIR = $(DESTDIR)/usr/bin
+MANDIR = $(DESTDIR)/usr/share/man
+LIBDIR = $(DESTDIR)/usr/lib
 
 SRCS = srdp.c utalk.c util.c termcap.c termio.c globals.c signal.c screen.c\
        functions.c kbd.c comm.c rc.c menu.c
@@ -21,10 +27,10 @@
 # you have ncurses installed you may want to change it to -lncurses.
 # On weird systems without a separate termcap library but with termcap
 # emulation in curses, you may need to set it to -lcurses.
-LIBS = -ltermcap
+LIBS = -lncurses
 
 # Extra libraries; uncomment this for Solaris, change it for other machines
-EXTRALIBS = -lsocket -lnsl
+# EXTRALIBS = -lsocket -lnsl
 
 # Uncomment this on non-POSIX BSD machines (NeXT, Sequent...) if you
 # have trouble compiling without it.
@@ -43,7 +49,7 @@
 
 #CFLAGS = -g -O -D__USE_FIXED_PROTOTYPES__ $(OPTS)
 #CFLAGS = -g -Wall -DDEBUG -D__USE_FIXED_PROTOTYPES__ $(OPTS)
-CFLAGS = -g -Wall -D__USE_FIXED_PROTOTYPES__ $(OPTS)
+CFLAGS = -O2 -g -Wall -D__USE_FIXED_PROTOTYPES__ $(OPTS)
 #LDFLAGS = -g
 
 CC = gcc
@@ -63,16 +69,16 @@
 
 install:	utalk utalk.1
 	# -strip utalk
-	-umask 022; mkdir $(BINDIR) 2>/dev/null
-	-umask 022; mkdir $(MANDIR) 2>/dev/null
-	-umask 022; mkdir $(LIBDIR) 2>/dev/null
-	-umask 022; mkdir $(MANDIR)/man1 2>/dev/null
+#	-umask 022; mkdir $(BINDIR) 2>/dev/null
+#	-umask 022; mkdir $(MANDIR) 2>/dev/null
+#	-umask 022; mkdir $(LIBDIR) 2>/dev/null
+#	-umask 022; mkdir $(MANDIR)/man1 2>/dev/null
 	cp utalk $(BINDIR)
-	chmod 755 $(BINDIR)/utalk
-	cp utalk.1 $(MANDIR)/man1
-	chmod 644 $(MANDIR)/man1/utalk.1
-	cp utalk.help $(LIBDIR)
-	chmod 644 $(LIBDIR)/utalk.help
+#	chmod 755 $(BINDIR)/utalk
+#	cp utalk.1 $(MANDIR)/man1
+#	chmod 644 $(MANDIR)/man1/utalk.1
+#	cp utalk.help $(LIBDIR)
+#	chmod 644 $(LIBDIR)/utalk.help
 
 clean:
 	rm -f $(OBJS) stest.o stest utalk core
--- utalk-1.0.1.beta.orig/termcap.h
+++ utalk-1.0.1.beta/termcap.h
@@ -24,7 +24,7 @@
 extern int tputs(char *str, int affcnt, int (*putc)(int));
 
 extern char *t_ce, *t_me, *t_mr, *t_md, *t_us;
-extern int xcursor, ycursor;	/* absolute; -1, -1 = unknown */
+extern volatile int xcursor, ycursor;	/* absolute; -1, -1 = unknown */
 
 extern void putcap(char *s);
 extern void init_termcap(void);