--- xcept/makefile.orig	Fri May 13 12:19:55 1994
+++ xcept/makefile	Sun Sep  1 14:27:37 1996
@@ -48,23 +48,31 @@
 #   should be displayed in the scripts menu. (Only used when not
 #   overridden by enironment variable XCEPTSCRIPTS or by command line
 #   option '-S').
-SCRIPTSDIR = /usr/local/btx
+SCRIPTSDIR = /usr/local/lib/xcept
 
 
 #define compiler and X11 include+library pathes 
-CC	= gcc
-XINC	= -I/usr/X386/include
-XLIB	= -L/usr/X386/lib
+#CC	= gcc
+XINC	= -I${X11BASE}/include
+XLIB	= -L${X11BASE}/lib
 #WARN	= -W -Wunused -Wswitch -Wcomment -Wshadow -Wpointer-arith -Wcast-qual
 
 
 #define location of the xcept binary and online manual (for 'make install').
 OWNER	= bin
-GROUP	= uucp
-MODE	= 755
+GROUP	= bin
+BINMODE	= 755
 BINDIR	= /usr/local/bin
-MANDIR	= /usr/local/man/manl
+MANDIR	= /usr/local/man/man1
+MANMODE = 644
 
+.ifdef NOMANCOMPRESS
+MANPAGE = xcept.1
+.else
+MANPAGE = xcept.1.gz
+MANCOMPRESS = gzip -c -9
+MANCLEAN = ${MANPAGE}
+.endif
 
 
 
@@ -73,7 +81,7 @@
 DEFS	= -DDEFAULTCEPTHOSTNAME=\"$(SERVERHOST)\"      \
 	  -DDEFAULTSOCKETPORT=$(SERVERPORT)           \
 	  -DXCEPTSCRIPTS_DEFAULTPATH=\"$(SCRIPTSDIR)\"		
-CFLAGS	= $(XINC) $(WARN) $(DEFS)
+CFLAGS	+= $(XINC) $(WARN) $(DEFS)
 
 
 SRCS = 	xcept.c xfont.c rawfont.c xwin.c layer6.c socket.c buttons.c \
@@ -84,34 +92,31 @@
 
 
 
-all:		xcept
+all:		xcept ${MANPAGE}
 
 xcept:		$(OBJS)
-		@echo 'linking $@'
-		@$(CC) $(OBJS) -o xcept $(XLIB) -lX11 -lnsl -lsocket /usr/ucblib/libucb.a
+		$(CC) $(OBJS) -o xcept $(XLIB) -lX11
 
 $(OBJS):
-		@echo 'compiling $*.c'
-		@$(CC) $(CFLAGS) -c $*.c
+		$(CC) $(CFLAGS) -c $*.c
 
 
 tags:		$(SRCS)
 		etags -e $(SRCS)
 
-install:	xcept
-		strip xcept
-		mv xcept $(BINDIR)
-		-chown $(OWNER) $(BINDIR)/xcept
-		-chgrp $(GROUP) $(BINDIR)/xcept
-		chmod $(MODE)   $(BINDIR)/xcept
-		cp xcept.1 $(MANDIR)
-		-chown $(OWNER) $(MANDIR)/xcept.1
-		-chgrp $(GROUP) $(MANDIR)/xcept.1
-		chmod 644       $(MANDIR)/xcept.1
-
+.ifndef NOMANCOMPRESS
+${MANPAGE}: xcept.1
+	${MANCOMPRESS} < xcept.1 > ${MANPAGE}
+.endif
+
+install:	all
+		${INSTALL} -c -o ${OWNER} -g ${GROUP} -m ${BINMODE} xcept\
+		${BINDIR}/xcept
+		${INSTALL} -c -o ${OWNER} -g ${GROUP} -m ${MANMODE}\
+		${MANPAGE} ${MANDIR}/${MANPAGE}
 
 clean:
-		@rm -f $(OBJS) xcept
+		@rm -f $(OBJS) xcept ${MANCLEAN}
 
 
 
--- xcept/script.c.orig	Fri Sep 24 16:07:29 1993
+++ xcept/script.c	Sun Sep  1 14:08:13 1996
@@ -1082,7 +1082,8 @@
 	    printf( "%s", b->value );
 	    fflush(stdout);
 	 }
-	 gets(tmpstr); 
+	 fgets(tmpstr, 300, stdin); 
+	 if ((ptr = strchr(tmpstr, '\n'))) *ptr = '\0';
    }
    else if(visible) {
       if(echo) {
@@ -1105,7 +1106,8 @@
 	 }
 	 printf("?  ");
 	 fflush(stdout);
-	 gets(tmpstr); 
+	 fgets(tmpstr, 300, stdin); 
+	 if ((ptr = strchr(tmpstr, '\n'))) *ptr = '\0';
 	 if( !strlen(tmpstr) ) strncpy( tmpstr, c->value, sizeof(tmpstr)-1 );
       }
    }
--- xcept/xcept.c.orig	Mon Apr 25 16:13:26 1994
+++ xcept/xcept.c	Sun Sep  1 14:01:54 1996
@@ -945,7 +945,6 @@
 int perr, p1, p2, p3, p4, p5, p6, p7, p8;
 {
    extern int errno;
-   extern char *sys_errlist[];
    static char errstr[200];
 
    if(!visible) {