diff options
| author | Solomon Peachy <pizza@shaftnet.org> | 2019-08-04 21:38:06 -0400 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2019-08-05 05:01:57 +0200 |
| commit | 0d3ea8231fa7ffe12be52af5bd7c1b41e0e06dfb (patch) | |
| tree | 2306a4ae21c07d00c242f8a5f525f782fe204112 | |
| parent | 8143e4437bdcb1c2b25013cc285834b224d8d93c (diff) | |
| download | rockbox-0d3ea8231fa7ffe12be52af5bd7c1b41e0e06dfb.tar.gz rockbox-0d3ea8231fa7ffe12be52af5bd7c1b41e0e06dfb.zip | |
Update documentation build to use saner version extraction
Patch by Igor Poretsky
Change-Id: I0c61d42dcac79b72c6b13d700732237a845f676e
| -rw-r--r-- | manual/Makefile | 2 | ||||
| -rw-r--r-- | manual/Makefile.pdflatex | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/manual/Makefile b/manual/Makefile index 410d5a68f5..e1d3c1fb81 100644 --- a/manual/Makefile +++ b/manual/Makefile | |||
| @@ -18,7 +18,7 @@ INCLUDES= $(TARGET_INC) -I$(FIRMDIR)/include -I$(FIRMDIR)/export -I. -I$(BUILDDI | |||
| 18 | .PHONY: all buildmanual clean objdir-check | 18 | .PHONY: all buildmanual clean objdir-check |
| 19 | MANFILE := rockbox-build | 19 | MANFILE := rockbox-build |
| 20 | 20 | ||
| 21 | VERSION= `$(TOOLSDIR)/version.sh $(ROOTDIR)` | 21 | VERSION ?= $(shell $(TOOLSDIR)/version.sh $(ROOTDIR)) |
| 22 | 22 | ||
| 23 | .PHONY: $(OBJDIR)/version.tex $(OBJDIR)/$(MANFILE).tex | 23 | .PHONY: $(OBJDIR)/version.tex $(OBJDIR)/$(MANFILE).tex |
| 24 | 24 | ||
diff --git a/manual/Makefile.pdflatex b/manual/Makefile.pdflatex index c533e0fed0..ad58315606 100644 --- a/manual/Makefile.pdflatex +++ b/manual/Makefile.pdflatex | |||
| @@ -6,7 +6,7 @@ HTLATEX := htlatex | |||
| 6 | HTOPTS1 := rockbox-html,charset=utf-8,early_ | 6 | HTOPTS1 := rockbox-html,charset=utf-8,early_ |
| 7 | HTOPTS2 := " -utf8 -cmozhtf" | 7 | HTOPTS2 := " -utf8 -cmozhtf" |
| 8 | HTOPTS3 := "-dhtml/ -cvalidate" | 8 | HTOPTS3 := "-dhtml/ -cvalidate" |
| 9 | VERSION=`$(TOOLSDIR)/version.sh $(ROOTDIR)` | 9 | VERSION ?= $(shell $(TOOLSDIR)/version.sh $(ROOTDIR)) |
| 10 | SPLITHTML ?= 2 | 10 | SPLITHTML ?= 2 |
| 11 | 11 | ||
| 12 | .PHONY: all cleaner buildmanual output | 12 | .PHONY: all cleaner buildmanual output |