Merge branch 'upstream'

This commit is contained in:
Geoffrey Challen
2017-01-09 22:59:46 -05:00
11 changed files with 162 additions and 39 deletions

View File

@@ -96,7 +96,7 @@
# the build. Default is $(WORKDIR)/tooldir.
#
# INSTALLTOP Staging directory for installation.
# Default is $(WORKDIR)/install
# Default is $(WORKDIR)/install.
#
# Probably the only reason to change these would be if you're short on
# diskspace in $(WORKDIR).

View File

@@ -55,10 +55,13 @@ installmanpages:
cp $(_F_) $(OSTREE)$(MANDIR)/$(_F_)
.endfor
# clean: remove build products (nothing to do)
clean-local: ;
# Mark targets that don't represent files PHONY, to prevent various
# lossage if files by those names appear.
.PHONY: all all-local install-staging-local install-local installmanpages
.PHONY: clean-local
# Finally, get the shared definitions for the most basic rules.
.include "$(TOP)/mk/os161.baserules.mk"