From: Sebastian K. <gi...@gi...> - 2013-11-23 19:45:25
|
docs: make linuxcnc.1 in the docs: target Instead of in the default: target. http://git.linuxcnc.org/?p=linuxcnc.git;a=commitdiff;h=2119397 --- docs/src/Submakefile | 5 +++++ src/Makefile | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/src/Submakefile b/docs/src/Submakefile index 1e486af..4dae44f 100644 --- a/docs/src/Submakefile +++ b/docs/src/Submakefile @@ -350,6 +350,11 @@ ifeq ($(TRIVIAL_BUILD),no) Makefile: $(patsubst %.txt, depends/%.d, $(DOC_SRCS_TXT)) endif +docs: ../docs/man/man1/linuxcnc.1 + +../docs/man/man1/linuxcnc.1: ../docs/src/man/man1/linuxcnc.1.in config.status + ./config.status --file=$@:$< + ifeq ($(BUILD_DOCS_PDF),yes) docs: pdfdocs install-doc: install-doc-pdf diff --git a/src/Makefile b/src/Makefile index 126439c..dd625e4 100755 --- a/src/Makefile +++ b/src/Makefile @@ -239,12 +239,6 @@ Makefile: config.h config.h: config.h.in config.status @./config.status -q --header=$@ -INFILES_MOVE = \ - ../docs/man/man1/linuxcnc.1 - -../docs/man/man1/linuxcnc.1: ../docs/src/man/man1/linuxcnc.1.in config.status - ./config.status --file=$@:$< - INFILES = \ ../scripts/linuxcnc ../scripts/realtime \ ../scripts/haltcl ../scripts/rtapi.conf Makefile.inc Makefile.modinc \ @@ -263,7 +257,7 @@ endif $(INFILES): %: %.in config.status @./config.status --file=$@ -default: $(INFILES) $(INFILES_MOVE) +default: $(INFILES) # For each file to be copied to ../include, its location in the source tree # is listed here. Note that due to $(INCLUDE), defined above, the include |