Merge lp:~unit193/xubuntu-docs/fixes into lp:xubuntu-docs/xenial

Proposed by Unit 193
Status: Merged
Merged at revision: 475
Proposed branch: lp:~unit193/xubuntu-docs/fixes
Merge into: lp:xubuntu-docs/xenial
Diff against target: 48 lines (+11/-3)
2 files modified
Makefile (+4/-3)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~unit193/xubuntu-docs/fixes
Reviewer Review Type Date Requested Status
Pasi Lallinaho (community) Approve
Review via email: mp+276597@code.launchpad.net

Description of the change

Update Makefile
 * Only run 'html' on the contributor docs, not run 'all'
 * Add contributor docs to the clean section.
 * Rename, contributors → contributors-html, to fall in line with the rest of the makefile.

To post a comment you must log in.
lp:~unit193/xubuntu-docs/fixes updated
475. By Unit 193

Update d/changelog.

Revision history for this message
Pasi Lallinaho (knome) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2015-10-30 20:40:48 +0000
3+++ Makefile 2015-11-03 22:27:30 +0000
4@@ -24,9 +24,6 @@
5 done >> build/index.html
6 cat startpage/xubuntu-index-end.htx >> build/index.html
7
8-contributors:
9- $(MAKE) -C contributor-docs all
10-
11 update-translations:
12 ifeq ($(TRANSLATIONS),)
13 ifneq ($(wildcard desktop-guide/po/LINGUAS),)
14@@ -49,6 +46,9 @@
15 export TRANSOPTS := -l "$(TRANSLATIONS)"
16 endif
17
18+contributors-html:
19+ $(MAKE) -C contributor-docs html
20+
21 html:
22 $(MAKE) -C desktop-guide html
23
24@@ -79,6 +79,7 @@
25
26 clean:
27 $(MAKE) -C desktop-guide clean
28+ $(MAKE) -C contributor-docs clean
29 rm -rf build xubuntu-docs.tar.gz
30
31 .PHONY: startpage
32
33=== removed file 'contributor-docs/style'
34=== modified file 'debian/changelog'
35--- debian/changelog 2015-11-02 09:14:20 +0000
36+++ debian/changelog 2015-11-03 22:27:30 +0000
37@@ -1,5 +1,12 @@
38 xubuntu-docs (16.04) UNRELEASED; urgency=medium
39
40+ [ Unit 193 ]
41+ * Makefile:
42+ - Only run 'html' on the contributor docs, not run 'all'.
43+ - Add contributor docs to the clean section.
44+ - Rename, contributors → contributors-html.
45+
46+
47 [ David Pires ]
48 * Bump version and start page to 16.04 Xenial Xerus
49

Subscribers

People subscribed via source and target branches