From 08e324848dbde56296e6772bfa72e601bea57837 Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Thu, 30 Oct 2008 19:47:11 +0100 Subject: [PATCH] Removed default-install from the generic build system. The default-install target is very specific for Sherlock and nobody else seems to use build/install. I have therefore moved this target back to the top-level Makefile as it was when the world was young. However, if we compile only the libraries (CONFIG_SHERLOCK is unset), we use the standard install target identical the one in free/libs/Makefile. --- build/Makebottom | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build/Makebottom b/build/Makebottom index 3ba1a395..b164f2b7 100644 --- a/build/Makebottom +++ b/build/Makebottom @@ -1,5 +1,5 @@ # Bottom part of Makefile for the UCW Libraries -# (c) 1997--2007 Martin Mares +# (c) 1997--2008 Martin Mares # The run tree @@ -213,14 +213,9 @@ $(patsubst %.html,%.txt,$(DOCS)): $(o)/%.txt: $(s)/%.txt $(s)/build/doc-extract $(M)"DOC-EXT $<" $(Q)$(s)/build/doc-extract $< $@ $(o)/depend.new $(s) $(patsubst %.txt,%.deflist,$@) -# Default installation target - -default-install: - SH_EXTRA_RUNDIRS="$(sort $(EXTRA_RUNDIRS))" SH_INSTALL_RUNDIRS="$(sort $(INSTALL_RUNDIRS))" SH_CONFIGS="$(sort $(CONFIGS))" SH_AUTO_CONFIRM="$(CONFIRM)" $(s)/build/installer $(INSTALL_DIR) - # Don't delete intermediate targets. There shouldn't be any, but due to bugs # in GNU Make rules with targets in not-yet-existing directories are ignored # when searching for implicit rules and thence targets considered intermediate. .SECONDARY: -.PHONY: all clean distclean runtree programs api datafiles force tags configs dust install default-install docs +.PHONY: all clean distclean runtree programs api datafiles force tags configs dust install docs -- 2.39.2