diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-05-17 12:02:49 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-05-17 12:03:24 -0700 |
| commit | a9397830f798810affbbadd0032750d0ed12c134 (patch) | |
| tree | aacdc66c9f77cedae9cb4e155a375d6e401c4d57 | |
| parent | 29e2f74a584d00887cd8524f70022143552ab2ba (diff) | |
| download | nasm-a9397830f798810affbbadd0032750d0ed12c134.tar.gz | |
Make the errors for missing man page tools comprehensible
A lot of confusion was had due to missing asciidoc...
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| -rw-r--r-- | Makefile.in | 10 | ||||
| -rw-r--r-- | configure.in | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/Makefile.in b/Makefile.in index 983ff6db..b3eb15f6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,7 +49,7 @@ ifeq ($(TRACE),1) CFLAGS += -DNASM_TRACE endif -.SUFFIXES: .c .i .s .$(O) .1 .txt +.SUFFIXES: .c .i .s .$(O) .1 .txt .xml .PHONY: all doc rdf install clean distclean cleaner spotless install_rdf test .PHONY: install_doc everything install_everything strip perlreq dist tags TAGS @@ -63,9 +63,11 @@ endif .c.i: $(CC) -E $(ALL_CFLAGS) -o $@ $< -.txt.1: - $(ASCIIDOC) -b docbook -d manpage -o $(patsubst %.1,%.xml,$@) $< - $(XMLTO) man --skip-validation $(patsubst %.1,%.xml,$@) 2>/dev/null +.txt.xml: + $(ASCIIDOC) -b docbook -d manpage -o $@ $< + +.xml.1: + $(XMLTO) man --skip-validation $< 2>/dev/null #-- Begin File Lists --# diff --git a/configure.in b/configure.in index b325dd22..da2154d1 100644 --- a/configure.in +++ b/configure.in @@ -67,9 +67,9 @@ PA_ADD_CFLAGS([-std=c99]) PA_ADD_CFLAGS([-pedantic]) dnl Look for programs... -AC_CHECK_PROGS(NROFF, nroff, echo) -AC_CHECK_PROGS(ASCIIDOC, asciidoc, echo) -AC_CHECK_PROGS(XMLTO, xmlto, echo) +AC_CHECK_PROGS(NROFF, nroff, false) +AC_CHECK_PROGS(ASCIIDOC, asciidoc, false) +AC_CHECK_PROGS(XMLTO, xmlto, false) AC_CHECK_PROGS(ACRODIST, acrodist, false) AC_CHECK_PROGS(PS2PDF, ps2pdf, false) AC_CHECK_PROGS(PSTOPDF, pstopdf, false) |