diff options
-rw-r--r-- | Documentation/include.mk | 24 | ||||
-rw-r--r-- | lib/PublicInbox/Admin.pm | 2 |
2 files changed, 23 insertions, 3 deletions
diff --git a/Documentation/include.mk b/Documentation/include.mk index 9fd85210..4af8d455 100644 --- a/Documentation/include.mk +++ b/Documentation/include.mk @@ -8,8 +8,12 @@ all:: # Maybe it's not worth it to support non-GNU make, though... RSYNC = rsync RSYNC_DEST = public-inbox.org:/srv/public-inbox/ +AWK = awk MAN = man + +# this is "xml" on FreeBSD and maybe some other distros: XMLSTARLET = xmlstarlet +AWK = awk # same as pod2text COLUMNS = 76 @@ -58,7 +62,9 @@ man8 := $(addsuffix .8, $(m8)) all:: man html -man: $(man1) $(man5) $(man7) $(man8) +manpages = $(man1) $(man5) $(man7) $(man8) + +man: $(manpages) prefix ?= $(PREFIX) prefix ?= $(HOME) @@ -83,6 +89,19 @@ doc_install :: install-man %.1 %.5 %.7 %.8 : Documentation/%.pod $(podman) -s $(subst .,,$(suffix $@)) $< $@+ && mv $@+ $@ +# n.b. not sure if our usage of man(1) is portable or not, so not +# enabled by default "check" target: +# check :: check-man +check_man = @echo CHECK80 $<;COLS=80 $(MAN) ./$^ | \ + $(AWK) 'length>80{print;err=1}END{exit(err)}' >&2 + +%.1.cols : %.1; $(check_man) +%.5.cols : %.5; $(check_man) +%.7.cols : %.7; $(check_man) +%.8.cols : %.8; $(check_man) + +check-man :: $(addsuffix .cols, $(manpages)) + manuals := manuals += $(m1) manuals += $(m5) @@ -116,7 +135,8 @@ NEWS NEWS.atom NEWS.html : check :: NEWS check-NEWS.atom NEWS.html check-NEWS.atom: NEWS.atom - $(XMLSTARLET) val $<; e=$$?; test $$e -eq 0 || test $$e -eq 127 + $(XMLSTARLET) val NEWS.atom || \ + { e=$$?; test $$e -eq 0 || test $$e -eq 127; } Documentation/%.html: Documentation/%.txt $(txt2pre) diff --git a/lib/PublicInbox/Admin.pm b/lib/PublicInbox/Admin.pm index dc70d690..2b25cf01 100644 --- a/lib/PublicInbox/Admin.pm +++ b/lib/PublicInbox/Admin.pm @@ -35,7 +35,7 @@ sub resolve_repo_dir { local $/; <$fh>; }; - close $fh or die "error in $cmd: $!\n"; + close $fh or die "error in $cmd (cwd:$cd): $!\n"; chomp $dir; $$ver = 1 if $ver; return abs_path($cd) if ($dir eq '.' && defined $cd); |