Move mk into separate directory

19 files changed, 35 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 0c59a31..7805ee7 100644
--- a/Makefile
+++ b/Makefile
@@ -2,22 +2,10 @@ TMACDIR ?= /usr/share/tmac
 BINDIR ?= /usr/local/bin
 MANDIR ?= /usr/local/man
 
-TROFF ?= troff
-PDFROFF ?= troff | dpost | ps2pdf -
-
-all: README.pdf HACKING.pdf
-
 install:
-	install -m 644 k.tmac t/toc.tmac $(TMACDIR)
+	install -m 644 mk/k.tmac t/toc.tmac $(TMACDIR)
 	install -m 644 toc/toc.1 list/list.1 $(MANDIR)/man1
 	install toc/toc list/list $(BINDIR)
 
-HACKING.pdf: HACKING.t k.tmac
-	perl -pe '$$_=`$$_` if s/^\!//' HACKING.t |\
-	LC_ALL=en_US.UTF-8\
-	$(PDFROFF) > HACKING.pdf
-
-README.pdf: README.t k.tmac
-	TROFFONTS=/usr/pkg/share/fonts/X11/TTF/\
-	LC_ALL=en_US.UTF-8\
-	<README.t toc/toc list/list -p.l \| $(PDFROFF) > README.pdf
+install-extra:
+	install -m 644 mk/kx.tmac $(TMACDIR)
diff --git a/README b/README
index 9096537..948fec3 100644
--- a/README
+++ b/README
@@ -1,8 +1,8 @@
 --- Overview ---
 
-This repository can be divided into three parts:
+This repository is divided into three subdirectories:
 
- * mk (top directory)
+ * mk
  * toc
  * list
 
@@ -29,3 +29,8 @@ You may want to set TMACDIR, BINDIR and MANDIR before installing.
   single Perl script:
 
     list -- escapes text between .l( and .l)
+
+--- Note ---
+
+Permission to use, copy, modify and/or distribute this software
+for any purpose with or without fee is hereby granted.
diff --git a/list/list b/list/list
index c2c4afb..11ec7c1 100755
--- a/list/list
+++ b/list/list
@@ -2,6 +2,10 @@
 
 # list -- escape code listing for troff
 
+# Permission to use, copy, modify and/or
+# distribute this software for any purpose
+# with or without fee is hereby granted.
+
 use Getopt::Std;
 BEGIN { getopt('Ep:s:') }
 
diff --git a/HACKING.pdf b/mk/HACKING.pdf
index 33ca978..04e2b86 100644
--- a/HACKING.pdf
+++ b/mk/HACKING.pdf
diff --git a/HACKING.t b/mk/HACKING.t
index 9084dd3..9084dd3 100644
--- a/HACKING.t
+++ b/mk/HACKING.t
diff --git a/mk/Makefile b/mk/Makefile
new file mode 100644
index 0000000..069eab1
--- /dev/null
+++ b/mk/Makefile
@@ -0,0 +1,14 @@
+TROFF ?= troff
+PDFROFF ?= troff | dpost | ps2pdf -
+
+all: README.pdf HACKING.pdf
+
+HACKING.pdf: HACKING.t k.tmac
+	perl -pe '$$_=`$$_` if s/^\!//' HACKING.t |\
+	LC_ALL=en_US.UTF-8\
+	$(PDFROFF) > HACKING.pdf
+
+README.pdf: README.t k.tmac
+	TROFFONTS=/usr/pkg/share/fonts/X11/TTF/\
+	LC_ALL=en_US.UTF-8\
+	<README.t ../toc/toc ../list/list -p.l \| $(PDFROFF) > README.pdf
diff --git a/README.pdf b/mk/README.pdf
index 177a8ed..9ab89af 100644
--- a/README.pdf
+++ b/mk/README.pdf
diff --git a/README.t b/mk/README.t
index a3d4e06..7e36106 100644
--- a/README.t
+++ b/mk/README.t
@@ -1,6 +1,6 @@
 .so k.tmac
 .so kx.tmac
-.so toc/toc.tmac
+.so ../toc/toc.tmac
 .mediasize letter
 .fp 0 M DejaVuSansMono ttf
 .hw Eng-lish
diff --git a/k.tmac b/mk/k.tmac
index d1ff918..d1ff918 100644
--- a/k.tmac
+++ b/mk/k.tmac
diff --git a/kx.tmac b/mk/kx.tmac
index 1122bf8..1122bf8 100644
--- a/kx.tmac
+++ b/mk/kx.tmac
diff --git a/t/Makefile b/mk/t/Makefile
index e040b7a..e040b7a 100644
--- a/t/Makefile
+++ b/mk/t/Makefile
diff --git a/t/k.tmac b/mk/t/k.tmac
index 9d9f235..9d9f235 100644
--- a/t/k.tmac
+++ b/mk/t/k.tmac
diff --git a/t/k.tmac.orig b/mk/t/k.tmac.orig
index ff5ef66..ff5ef66 100644
--- a/t/k.tmac.orig
+++ b/mk/t/k.tmac.orig
diff --git a/t/ne.t b/mk/t/ne.t
index ac318a7..ac318a7 100644
--- a/t/ne.t
+++ b/mk/t/ne.t
diff --git a/t/t.tmac b/mk/t/t.tmac
index 223babe..223babe 100644
--- a/t/t.tmac
+++ b/mk/t/t.tmac
diff --git a/toc/README.pdf b/toc/README.pdf
index 317cbc4..f29e5eb 100644
--- a/toc/README.pdf
+++ b/toc/README.pdf
diff --git a/toc/README.t b/toc/README.t
index 919b300..a350e81 100644
--- a/toc/README.t
+++ b/toc/README.t
@@ -1,5 +1,5 @@
-.so ../k.tmac
-.so ../kx.tmac
+.so ../mk/k.tmac
+.so ../mk/kx.tmac
 .so toc.tmac
 .
 .t
diff --git a/toc/example.pdf b/toc/example.pdf
index 1615176..2a568a5 100644
--- a/toc/example.pdf
+++ b/toc/example.pdf
diff --git a/toc/toc b/toc/toc
index f6c2501..4518cf6 100755
--- a/toc/toc
+++ b/toc/toc
@@ -2,6 +2,10 @@
 
 # toc -- run troff in three passes
 
+# Permission to use, copy, modify and/or
+# distribute this software for any purpose
+# with or without fee is hereby granted.
+
 usage() {
 	echo "usage: $0 [cmd ... \|] <troff> [arg ...]" 1>&2
 	echo "(input should be given on stdin)" 1>&2