4 files changed, 129 insertions, 25 deletions
diff --git a/tcpip/Makefile.am b/tcpip/Makefile.am
index 4fbc7e9..88e07fd 100644
--- a/tcpip/Makefile.am
+++ b/tcpip/Makefile.am
@@ -1,19 +1,21 @@
 
 etcfiles = rip98.conf ttylinkd.conf
-etcdir = $(sysconfdir)/ax25
 
 installconf:
-	$(mkinstalldirs) $(DESTDIR)$(etcdir)
+	$(mkinstalldirs) $(DESTDIR)$(AX25_SYSCONFDIR)
 	@list='$(etcfiles)'; for p in $$list; do \
-	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p"; \
-	  $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p; \
+	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(AX25_SYSCONFDIR)/$$p"; \
+	  $(INSTALL_DATA) $$p $(DESTDIR)$(AX25_SYSCONFDIR)/$$p; \
 	done
 
 sbin_PROGRAMS = rip98d ttylinkd
 
 man_MANS = rip98.conf.5 rip98d.8 ttylinkd.conf.5 ttylinkd.8
 
-EXTRA_DIST = $(man_MANS) $(etcfiles)
+docdir=${prefix}/doc/ax25-tools
+doc_DATA= ttylinkd.README ttylinkd.INSTALL
+
+EXTRA_DIST = $(man_MANS) $(etcfiles) $(doc_DATA)
 
 rip98d_SOURCES = 	\
 	rip98d.c	\
@@ -23,3 +25,9 @@ rip98d_SOURCES = 	\
 
 rip98d_LDADD = $(AX25_LIB)
 
+INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" \
+	   -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" 
+
+AX25_SYSCONFDIR=${sysconfdir}/ax25/
+AX25_LOCALSTATEDIR=${localstatedir}/ax25/
+
diff --git a/tcpip/Makefile.in b/tcpip/Makefile.in
index 84ce5b2..95bf91a 100644
--- a/tcpip/Makefile.in
+++ b/tcpip/Makefile.in
@@ -69,18 +69,26 @@ VERSION = @VERSION@
 Z_LIB = @Z_LIB@
 
 etcfiles = rip98.conf ttylinkd.conf
-etcdir = $(sysconfdir)/ax25
 
 sbin_PROGRAMS = rip98d ttylinkd
 
 man_MANS = rip98.conf.5 rip98d.8 ttylinkd.conf.5 ttylinkd.8
 
-EXTRA_DIST = $(man_MANS) $(etcfiles)
+docdir = ${prefix}/doc/ax25-tools
+doc_DATA = ttylinkd.README ttylinkd.INSTALL
+
+EXTRA_DIST = $(man_MANS) $(etcfiles) $(doc_DATA)
 
 rip98d_SOURCES =  	rip98d.c		rip98r.c		rip98t.c		rip98d.h
 
 
 rip98d_LDADD = $(AX25_LIB)
+
+INCLUDES = -DAX25_SYSCONFDIR=\""$(AX25_SYSCONFDIR)"\" 	   -DAX25_LOCALSTATEDIR=\""$(AX25_LOCALSTATEDIR)"\" 
+
+
+AX25_SYSCONFDIR = ${sysconfdir}/ax25/
+AX25_LOCALSTATEDIR = ${localstatedir}/ax25/
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES = 
@@ -112,6 +120,8 @@ man8dir = $(mandir)/man8
 MANS = $(man_MANS)
 
 NROFF = nroff
+DATA =  $(doc_DATA)
+
 DIST_COMMON =  Makefile.am Makefile.in
 
 
@@ -257,6 +267,25 @@ uninstall-man:
 	@$(NORMAL_UNINSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) uninstall-man5 uninstall-man8
 
+install-docDATA: $(doc_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(docdir)
+	@list='$(doc_DATA)'; for p in $$list; do \
+	  if test -f $(srcdir)/$$p; then \
+	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p"; \
+	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(docdir)/$$p; \
+	  else if test -f $$p; then \
+	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p"; \
+	    $(INSTALL_DATA) $$p $(DESTDIR)$(docdir)/$$p; \
+	  fi; fi; \
+	done
+
+uninstall-docDATA:
+	@$(NORMAL_UNINSTALL)
+	list='$(doc_DATA)'; for p in $$list; do \
+	  rm -f $(DESTDIR)$(docdir)/$$p; \
+	done
+
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP)
@@ -301,10 +330,6 @@ distdir: $(DISTFILES)
 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
 	  fi; \
 	done
-rip98d.o: rip98d.c ../config.h ../pathnames.h rip98d.h
-rip98r.o: rip98r.c rip98d.h
-rip98t.o: rip98t.c rip98d.h
-ttylinkd.o: ttylinkd.c ../config.h ../pathnames.h
 
 info-am:
 info: info-am
@@ -317,21 +342,21 @@ installcheck: installcheck-am
 install-exec-am: install-sbinPROGRAMS
 install-exec: install-exec-am
 
-install-data-am: install-man
+install-data-am: install-man install-docDATA
 install-data: install-data-am
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-sbinPROGRAMS uninstall-man
+uninstall-am: uninstall-sbinPROGRAMS uninstall-man uninstall-docDATA
 uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS) $(MANS)
+all-am: Makefile $(PROGRAMS) $(MANS) $(DATA)
 all-redirect: all-am
 install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir)/man5 \
-		$(DESTDIR)$(mandir)/man8
+		$(DESTDIR)$(mandir)/man8 $(DESTDIR)$(docdir)
 
 
 mostlyclean-generic:
@@ -370,20 +395,21 @@ maintainer-clean: maintainer-clean-am
 clean-sbinPROGRAMS maintainer-clean-sbinPROGRAMS uninstall-sbinPROGRAMS \
 install-sbinPROGRAMS mostlyclean-compile distclean-compile \
 clean-compile maintainer-clean-compile install-man5 uninstall-man5 \
-install-man8 uninstall-man8 install-man uninstall-man tags \
-mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \
-distdir info-am info dvi-am dvi check check-am installcheck-am \
-installcheck install-exec-am install-exec install-data-am install-data \
-install-am install uninstall-am uninstall all-redirect all-am all \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+install-man8 uninstall-man8 install-man uninstall-man uninstall-docDATA \
+install-docDATA tags mostlyclean-tags distclean-tags clean-tags \
+maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
+installcheck-am installcheck install-exec-am install-exec \
+install-data-am install-data install-am install uninstall-am uninstall \
+all-redirect all-am all installdirs mostlyclean-generic \
+distclean-generic clean-generic maintainer-clean-generic clean \
+mostlyclean distclean maintainer-clean
 
 
 installconf:
-	$(mkinstalldirs) $(DESTDIR)$(etcdir)
+	$(mkinstalldirs) $(DESTDIR)$(AX25_SYSCONFDIR)
 	@list='$(etcfiles)'; for p in $$list; do \
-	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p"; \
-	  $(INSTALL_DATA) $$p $(DESTDIR)$(etcdir)/$$p; \
+	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(AX25_SYSCONFDIR)/$$p"; \
+	  $(INSTALL_DATA) $$p $(DESTDIR)$(AX25_SYSCONFDIR)/$$p; \
 	done
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/tcpip/ttylinkd.INSTALL b/tcpip/ttylinkd.INSTALL
new file mode 100644
index 0000000..70de9b3
--- /dev/null
+++ b/tcpip/ttylinkd.INSTALL
@@ -0,0 +1,36 @@
+To install ttylinkd;
+
+To create binary:
+	make
+
+To install binary and man pages:
+	make install
+
+Then edit the file /etc/ax25/ttylinkd.conf to change the sysops login to
+whoever you want.
+
+That should hopefully be it, although you may want to do/check the
+following;
+
+  * Ensure that there is a line in /etc/services that says
+	'link	87/tcp	ttylink'.
+  * Add the following line to /etc/inetd.conf,
+	'ttylink stream tcp   nowait root   /usr/sbin/ttylinkd ttylinkd'
+  * Get inetd to re-read config file by sending a HUP signal to it.
+	To do this find the process number of inetd with ps and then type
+	'kill -SIGHUP <number>'
+
+If you want connections from AX25, Net/ROM or ROSE ports, you will have to
+edit your ax25d.conf file too, for example mine has;
+[VK2XLZ-1 VIA VHF]
+NOCALL	 * * * * * *  L
+default  * * * * * *  - root /usr/bin/node node
+[VK2XLZ-6 VIA VHF]
+NOCALL   * * * * * *  L
+default  * * * * * *  - root /usr/sbin/ttylinkd ttylinkd
+
+etc, pretty simple stuff.
+
+For programs like node etc to connect to sysop, specify the callers callsign
+as a parameter, eg ttylinkd <callsign>.  This will send a message to the
+sysop's screen that <callsign> wants to talk to them.
diff --git a/tcpip/ttylinkd.README b/tcpip/ttylinkd.README
new file mode 100644
index 0000000..40d8003
--- /dev/null
+++ b/tcpip/ttylinkd.README
@@ -0,0 +1,34 @@
+README file for ttylinkd: The ttylink daemon, dated 5 Mar 1997
+
+This program allows you to recieve ttylink requests from NOS or other
+stations.  It uses the normal Un*x talk protocol for the sysop end and inetd
+for the user's end.
+
+As of 0.02, we now accept connections for Net/ROM and AX.25.
+As of 0.03, we now accept connections from ROSE (not tested!)
+
+USAGE
+=====
+When someone connects to the ttylink port of you system (usually port 87)
+the inetd program will spawn a ttylinkd process.  This process will send a
+welcome and then ask the user to type in their callsign.
+A talk invitation is then sent to the sysop with the given user name to
+reply.  If the sysop wants to talk to the user, they then use the talk
+command.
+Either party can finish the conversation in the usual way.
+
+
+BUGS / TO DO
+============
+- Get some real documentation on ntalkd to make sure that I am doing things
+	right.
+- Allow the sysop to be on another system (if users of ttylinkd want this).
+
+
+CREDITS
+=======
+This program and documentation Copyright (C) 1997 Craig Small VK2XLZ
+(csmall@gonzo.triode.net.au), (csmall@gonzo.vk2xlz.ampr.org).
+Please read the file ttylinkd.c for full notice.
+Thanks to Tomi Manninen OH2BNS for the AX.25 patches in 0.02
+Thanks to Tomi again for the short callsign fix in 0.03
+\ No newline at end of file