Make some minor corrections for install-in-build-tree.
Signed-off-by: Garrett Cooper <yanegomi@gmail.com>
diff --git a/Makefile b/Makefile
index b7fa035..088cd69 100644
--- a/Makefile
+++ b/Makefile
@@ -69,8 +69,13 @@
endef
COMMON_TARGETS += testcases tools
-INSTALL_TARGETS += $(COMMON_TARGETS) runtest testscripts
-CLEAN_TARGETS += $(COMMON_TARGETS) lib include runtest testscripts
+# Don't want to nuke the original files if we're installing in-build-tree.
+ifneq ($(INSTALL_IN_BUILD_TREE),1)
+INSTALL_TARGETS += runtest testscripts
+CLEAN_TARGETS += include runtest testscripts
+endif
+INSTALL_TARGETS += $(COMMON_TARGETS)
+CLEAN_TARGETS += $(COMMON_TARGETS) lib
BOOTSTRAP_TARGETS := $(sort $(COMMON_TARGETS) $(CLEAN_TARGETS) $(INSTALL_TARGETS))
CLEAN_TARGETS := $(addsuffix -clean,$(CLEAN_TARGETS))
diff --git a/include/mk/env_pre.mk b/include/mk/env_pre.mk
index 45dd6db..37a3a9d 100644
--- a/include/mk/env_pre.mk
+++ b/include/mk/env_pre.mk
@@ -98,6 +98,9 @@
# there yet, but the variable itself has its own uses...
ifeq ($(strip $(DESTDIR)$(prefix)),)
INSTALL_IN_BUILD_TREE := 1
+else
+ifeq ($(subst $(abs_top_srcdir),,$(prefix)),)
+INSTALL_IN_BUILD_TREE := 1
endif
endif
@@ -105,6 +108,7 @@
include $(abs_top_builddir)/include/mk/config.mk
endif
+# make 3.80 called it .DEFAULT_TARGET.
.DEFAULT_GOAL := all
endif