From ef1a50e1ddb5e264c2b95c2199fe9945c04e70ea Mon Sep 17 00:00:00 2001 From: Olivier Ramonat Date: Thu, 13 Dec 2007 17:37:31 +0100 Subject: [PATCH] Use mk.install to store INSTALL var --- makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/makefile b/makefile index a32c573..2e1d843 100644 --- a/makefile +++ b/makefile @@ -48,23 +48,21 @@ all: build include mk.modules -ifeq ("$(INSTALL)", "..") -$(error "Wrong install path : INSTALL='$(INSTALL)'") -else -ifeq ("$(INSTALL)", "") -$(error "Wrong install path : empty INSTALL var") -endif +mkinstall: force +ifneq ($(INSTALL), "") +# Write INSTALL target into mk.install (see install target) + $(shell echo INSTALL = $(INSTALL) > mk.install) endif BUILD_DIR=".build/$(shell echo $(MODE) | tr [[:upper:]] [[:lower:]])" # Targets -build: build-default +build: mkinstall build-default -setup: global-setup setup-default +setup: global_setup setup-default -clean: global-clean clean-default +clean: global_clean clean-default check: check-default @@ -111,6 +109,8 @@ install_dirs: install_clean $(MKDIR) $(I_GPR) $(MKDIR) $(I_DLIB) +-include mk.install + install: install_dirs $(CP) $(BUILD_DIR)/d/lib/* $(I_LIB_D) for library in `ls $(I_LIB_D)/*$(SOEXT)`; do \ -- 2.11.4.GIT