fix in Makefiles to build without docs

Khaelenmore · Jan 26, 2014 · 77e0e84 · 77e0e84
1 parent e74345c
commit 77e0e84
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -28,7 +28,7 @@ rules:
 	ln -sf Rules.make.standalone Rules.make
 
 docs: rules
-#	make docs -C doc/
+	make docs -C doc/
 
 PKGBUILD: PKGBUILD.in tarball
 	cat PKGBUILD.in | sed -e s/MD5SUM/`md5sum $(ARCHIVE) | cut -f1 -d' '`/g > PKGBUILD

diff --git a/doc/Makefile b/doc/Makefile
@@ -23,7 +23,7 @@ docs:	wiki man pdf
 
 install:
 	$(INSTALLD) $(DESTDIR)$(DOCPATH)
-	$(INSTALL) *.txt *.html *.pdf $(DESTDIR)$(DOCPATH)
+	-$(INSTALL) instead.txt *.html *.pdf $(DESTDIR)$(DOCPATH)
 
 	$(INSTALLD) $(DESTDIR)$(MANPATH)
 	$(INSTALL) *.6 $(DESTDIR)$(MANPATH)

diff --git a/doc/makepdfs b/doc/makepdfs
@@ -40,7 +40,7 @@ function build_manual()
 	pdflatex instead-manual.tex
 	pdflatex instead-manual.tex
 	pdflatex instead-manual.tex
-	rm -f *.toc *.aux *.out *.log
+	rm -f *.toc *.aux *.out *.log instead-manual.tex
 }
 
 function build_modules()
@@ -72,7 +72,7 @@ function build_modules()
 	pdflatex instead-modules.tex
 	pdflatex instead-modules.tex
 	pdflatex instead-modules.tex
-	rm -f *.toc *.aux *.out *.log
+	rm -f *.toc *.aux *.out *.log instead-modules.tex
 }
 build_manual
 build_modules