diff -x configure -ur orig/pilot-link.0.4.3/Makefile.in pilot-link.0.4.3/Makefile.in
--- orig/pilot-link.0.4.3/Makefile.in	Wed Jan 15 23:01:37 1997
+++ pilot-link.0.4.3/Makefile.in	Wed Feb  5 00:06:34 1997
@@ -1,5 +1,5 @@
 CC = @CC@
-CFLAGS = @CFLAGS@ @CWFLAG@ -I./include
+CFLAGS = @CFLAGS@ @CWFLAG@ -I./include -I$(srcdir)/include
 # -DDEBUG
 RANLIB = @RANLIB@
 RM = rm -f
@@ -9,6 +9,9 @@
 CPLIB = @CPLIB@
 EXT =
 SUBMAKE_COMM = cd lib ; $(MAKE)
+prefix=@prefix@
+srcdir=@srcdir@
+VPATH=@srcdir@
 
 EXECS = install-memo$(EXT) install-user$(EXT)\
 		install-todos$(EXT) pilot-addresses$(EXT)\
@@ -19,6 +22,11 @@
 		test-connector$(EXT) test-acceptor$(EXT) debugsh$(EXT) dlpsh$(EXT)
 
 all: submake $(EXECS)
+
+install:
+	if [ ! -x $(DESTDIR)$(prefix)/bin ]; then mkdir $(DESTDIR)$(prefix)/bin; fi
+	cp $(EXECS) $(DESTDIR)$(prefix)/bin/
+	strip $(DESTDIR)$(prefix)/bin/*
 
 submake lib/libpisock.a:
 	$(SUBMAKE_COMM)
diff -x configure -ur orig/pilot-link.0.4.3/configure.in pilot-link.0.4.3/configure.in
--- orig/pilot-link.0.4.3/configure.in	Fri Jan 10 22:10:38 1997
+++ pilot-link.0.4.3/configure.in	Tue Feb  4 21:16:32 1997
@@ -23,7 +23,7 @@
 dnl Checks for library functions.
 AC_PROG_GCC_TRADITIONAL
 AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(atexit strchr memcpy strtoul cfmakeraw cfsetspeed cfsetispeed cfsetospeed sigaction)
+AC_CHECK_FUNCS(atexit strchr memcpy strtoul cfmakeraw cfsetspeed cfsetispeed cfsetospeed sigaction strdup)
 
 AC_CACHE_CHECK([for cispeed and cospeed members of struct termios],
   ac_cv_termios_cspeed,
diff -x configure -ur orig/pilot-link.0.4.3/debugsh.c pilot-link.0.4.3/debugsh.c
--- orig/pilot-link.0.4.3/debugsh.c	Sun Dec  1 20:01:39 1996
+++ pilot-link.0.4.3/debugsh.c	Wed Feb  5 01:28:03 1997
@@ -10,6 +10,9 @@
 #include <signal.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#ifdef _AIX
+#include <sys/select.h>
+#endif
 #include "pi-socket.h"
 #include "dlp.h"
 #include "syspkt.h"
diff -x configure -ur orig/pilot-link.0.4.3/dlpsh.c pilot-link.0.4.3/dlpsh.c
--- orig/pilot-link.0.4.3/dlpsh.c	Sun Jan 12 19:52:32 1997
+++ pilot-link.0.4.3/dlpsh.c	Wed Feb  5 00:02:04 1997
@@ -67,7 +67,7 @@
   char fl_name = 0, fl_uid = 0, fl_vid = 0, fl_pid = 0;
   int c, ret;
 
-#ifdef sun
+#if defined(sun)||defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
@@ -159,7 +159,7 @@
   int cardno, flags, start;
   int rom_flag = 0;
 
-#ifdef sun
+#if defined(sun)||defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
diff -x configure -ur orig/pilot-link.0.4.3/include/pi-config.h.in pilot-link.0.4.3/include/pi-config.h.in
--- orig/pilot-link.0.4.3/include/pi-config.h.in	Sat Jan 18 19:02:39 1997
+++ pilot-link.0.4.3/include/pi-config.h.in	Wed Feb  5 00:40:04 1997
@@ -19,6 +19,9 @@
 /* Define if you have the memcpy function.  */
 #undef HAVE_MEMCPY
 
+/* Define if you have the strdup function.  */
+#undef HAVE_STRDUP
+
 /* Define if you have the strchr function.  */
 #undef HAVE_STRCHR
 
diff -x configure -ur orig/pilot-link.0.4.3/lib/Makefile.in pilot-link.0.4.3/lib/Makefile.in
--- orig/pilot-link.0.4.3/lib/Makefile.in	Sat Jan 18 19:04:05 1997
+++ pilot-link.0.4.3/lib/Makefile.in	Fri Jan 31 18:53:26 1997
@@ -3,7 +3,7 @@
        sync.o pi-file.o
 
 CC = @CC@
-CFLAGS = @CFLAGS@ @CWFLAG@ -I../include
+CFLAGS = @CFLAGS@ @CWFLAG@ -I../include -I$(srcdir)/../include
 # -DDLP_TRACE
 # -DDEBUG
 # -DTRACE
@@ -11,6 +11,8 @@
 ARFLAGS = @ARFLAGS@
 RANLIB = @RANLIB@
 RM = rm -f
+srcdir=@srcdir@
+VPATH=@srcdir@
 
 all: libpisock.a
 
diff -x configure -ur orig/pilot-link.0.4.3/lib/memo.c pilot-link.0.4.3/lib/memo.c
--- orig/pilot-link.0.4.3/lib/memo.c	Fri Jan  3 00:20:31 1997
+++ pilot-link.0.4.3/lib/memo.c	Tue Feb  4 21:18:01 1997
@@ -18,6 +18,14 @@
     free(a->text);
 }
 
+#ifndef HAVE_STRDUP
+char* strdup(char *s) {
+	char *r = malloc(strlen(s)+1);
+	if(r) strcpy(r,s);
+	return r;
+}
+#endif /* HAVE_STRDUP */
+
 void unpack_Memo(struct Memo * a, unsigned char * buffer, int len) {
   a->text = strdup(buffer);
 }
diff -x configure -ur orig/pilot-link.0.4.3/lib/serial.c pilot-link.0.4.3/lib/serial.c
--- orig/pilot-link.0.4.3/lib/serial.c	Sat Jan 18 18:49:38 1997
+++ pilot-link.0.4.3/lib/serial.c	Wed Feb  5 01:20:55 1997
@@ -7,6 +7,9 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#ifdef _AIX
+#include <sys/select.h>
+#endif
 #include <stdio.h>
 #include "pi-socket.h"
 #include "pi-serial.h"
diff -x configure -ur orig/pilot-link.0.4.3/pilot-addresses.c pilot-link.0.4.3/pilot-addresses.c
--- orig/pilot-link.0.4.3/pilot-addresses.c	Thu Jan 16 11:25:06 1997
+++ pilot-link.0.4.3/pilot-addresses.c	Tue Feb  4 22:34:34 1997
@@ -262,7 +262,7 @@
   char * defaultcategoryname = 0;
   int mode = 0;
   int c;
-#ifdef sun
+#if defined(sun) || defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
diff -x configure -ur orig/pilot-link.0.4.3/pilot-file.c pilot-link.0.4.3/pilot-file.c
--- orig/pilot-link.0.4.3/pilot-file.c	Thu Jan  2 17:44:19 1997
+++ pilot-link.0.4.3/pilot-file.c	Tue Feb  4 23:01:54 1997
@@ -16,7 +16,7 @@
 #include "dlp.h"
 #include "pi-file.h"
 
-#ifdef sun
+#if defined(sun)||defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
diff -x configure -ur orig/pilot-link.0.4.3/pilot-xfer.c pilot-link.0.4.3/pilot-xfer.c
--- orig/pilot-link.0.4.3/pilot-xfer.c	Sat Jan 18 18:52:59 1997
+++ pilot-link.0.4.3/pilot-xfer.c	Tue Feb  4 22:59:48 1997
@@ -7,6 +7,7 @@
  */
 
 #include <stdio.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
 #include "dlp.h"
@@ -380,7 +381,7 @@
 int main(int argc, char *argv[])
 {
   int c;
-#ifdef sun
+#if defined(sun)||defined(ultrix)
   extern char* optarg;
   extern int optind;
 #endif
diff -x configure -ur orig/pilot-link.0.4.3/sync-memodir.c pilot-link.0.4.3/sync-memodir.c
--- orig/pilot-link.0.4.3/sync-memodir.c	Fri Dec 20 11:39:19 1996
+++ pilot-link.0.4.3/sync-memodir.c	Tue Feb  4 22:53:53 1997
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 #include <sys/stat.h>
 #include "pi-socket.h"
 #include "datebook.h"