diff -urp orig/pilot-link.0.8.7/Makefile.in pilot-link.0.8.7/Makefile.in
--- orig/pilot-link.0.8.7/Makefile.in	Tue Oct  7 10:55:21 1997
+++ pilot-link.0.8.7/Makefile.in	Thu Oct  9 02:11:00 1997
@@ -34,9 +34,9 @@ CC = @CC@
 CXX = @CXX@
 CDEFS = -DLIBDIR=\"$(libdir)\" 
 # -DDEBUG
-CFLAGS = -I./include -I$(srcdir)/include @CFLAGS@ @CWFLAG@ $(RLDEFS) $(CDEFS) $(TCLTK_FLAGS)
-CXXFLAGS = -I./include -I$(srcdir)/include @CXXFLAGS@ @CWFLAG@ $(RLDEFS) $(CDEFS) $(TCLTK_FLAGS)
-LDFLAGS = @LDFLAGS@
+CFLAGS = -I./include -I$(srcdir)/include @CFLAGS@ @CWFLAG@ $(RLDEFS) $(CDEFS) $(TCLTK_FLAGS) $(USERFLAGS)
+CXXFLAGS = -I./include -I$(srcdir)/include @CXXFLAGS@ @CWFLAG@ $(RLDEFS) $(CDEFS) $(TCLTK_FLAGS) $(USERFLAGS)
+LDFLAGS = @LDFLAGS@ $(USERLDFLAGS)
 LIBS = @LIBS@
 # -lefence
 CXXLIBS = @CXXLIBS@
@@ -114,12 +114,13 @@ install: $(EXECS) installdirs $(PILIB) $
 		$(INSTALL_DATA) $(PICCLIB) $(libdir)/libpicc.la; \
 	fi
 	for p in $(EXECS); do \
-		$(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
+		if [ -x $$p ]; then $(INSTALL_PROGRAM) $$p $(bindir)/$$p; \
+		else $(INSTALL_PROGRAM) $(srcdir)/$$p $(bindir)/$$p; fi; \
 	done
 	for h in include/*.h $(srcdir)/include/*.h include/*.hxx $(srcdir)/include/*.hxx; do \
 		$(INSTALL_DATA) $$h $(includedir)/`basename $$h`; \
 	done
-	for m in man/*.1; do \
+	for m in $(srcdir)/man/*.1; do \
 		$(INSTALL_DATA) $$m $(mandir)/`basename $$m`; \
 	done
 	for p in $(srcdir)/pix/*.gif $(srcdir)/pix/*.xbm; do \
@@ -183,10 +184,10 @@ pilot-clip$(EXT): $(PILIB) pilot-clip.o
 	$(CCLINK) pilot-clip.o $(PILIB) -o $@ $(LIBS)
 
 pilot-debug.o: pilot-debug.c Makefile
-	$(CC) $(CFLAGS) -c pilot-debug.c
+	$(CC) $(CFLAGS) -c $(srcdir)/pilot-debug.c
 
 pd-tty.o: pd-tty.c Makefile
-	$(CC) $(CFLAGS) -c pd-tty.c
+	$(CC) $(CFLAGS) -c $(srcdir)/pd-tty.c
 
 pilot-debug$(EXT): $(PILIB) pilot-debug.o pd-tty.o
 	$(CCLINK) pilot-debug.o pd-tty.o $(PILIB) -o $@ $(TCLTK_LIBS) $(RLLIBS) $(LIBS)
@@ -235,7 +236,7 @@ getrom$(EXT): $(PILIB) getrom.o
 
 parsedate.c: parsedate.y
 	@echo Expect six shift/reduce conflicts
-	$(YACC) parsedate.y
+	$(YACC) $(srcdir)/parsedate.y
 	mv y.tab.c parsedate.c
 
 pilot-undelete: pilot-undelete.PL
Only in pilot-link.0.8.7: Makefile.in.orig
Only in pilot-link.0.8.7: Makefile.in.rej
diff -urp orig/pilot-link.0.8.7/libcc/Makefile.in pilot-link.0.8.7/libcc/Makefile.in
--- orig/pilot-link.0.8.7/libcc/Makefile.in	Tue Oct  7 10:55:21 1997
+++ pilot-link.0.8.7/libcc/Makefile.in	Thu Oct  9 00:25:16 1997
@@ -29,7 +29,7 @@ LIBTOOL = @LIBTOOL@
 .SUFFIXES: .out .o .lo .la .cc .c .e .r .f .y .l .s .p
 
 .cc.o:
-	$(CXX) $(CXXFLAGS) -c $*.cc
+	$(CXX) $(CXXFLAGS) -c $<
 
 .cc.lo:
 	$(LIBTOOL) --mode=compile $(CXX) $(CXXFLAGS) -c $<
@@ -45,7 +45,7 @@ libpicc.a: $(CCOBJS)
 	$(RM) libpicc.a
 	$(AR) $(ARFLAGS) libpicc.a $(CCOBJS)
 	$(RANLIB) libpicc.a
-	
+
 clean:
 	$(RM) *.o *.a core a.out *.orig *.lo *.la
 	$(RM) -rf .libs _libs
Only in pilot-link.0.8.7/libcc: Makefile.in.orig