Skip to content

Commit

Permalink
Merge pull request kivy#7 from thopiekar/make-doc-build-failsave
Browse files Browse the repository at this point in the history
Make doc build failsave
  • Loading branch information
thopiekar committed Jan 25, 2015
2 parents e5ecee8 + 36e9c39 commit 420f7b5
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Kivy.egg-info
*.kpf
build/*
doc/build
doc/autobuild.py-done*
doc/sources/api-*.rst
kivy/*.c
kivy/*.pyd
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ INSTALL_ROOT =
INSTALL_PREFIX =
INSTALL_LAYOUT =

ifeq ($(INSTALL_ROOT),)
ifneq ($(INSTALL_ROOT),)
INSTALL_OPTIONS += --root=$(INSTALL_ROOT)
endif
ifeq ($(INSTALL_PREFIX),)
ifneq ($(INSTALL_PREFIX),)
INSTALL_OPTIONS += --prefix=$(INSTALL_PREFIX)
endif
ifeq ($(INSTALL_LAYOUT),)
ifneq ($(INSTALL_LAYOUT),)
INSTALL_OPTIONS += --install-layout=$(INSTALL_LAYOUT)
endif

Expand Down

0 comments on commit 420f7b5

Please sign in to comment.