From 610a122f7461c6dc9b52d8045f09783b73258c30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Fri, 17 Aug 2012 08:56:22 +0200 Subject: [PATCH] Noux: change default --prefix in noux.mk The directory specified by --prefix is not only used to determine the install location but is also used by -rpath. Therefor it is better to use $(DESTDIR) to install the binaries to the right directory and to use --prefix to express the actual location within NOUX. --- ports/mk/noux.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/mk/noux.mk b/ports/mk/noux.mk index 06830f60c2..5c24674e4c 100644 --- a/ports/mk/noux.mk +++ b/ports/mk/noux.mk @@ -77,7 +77,7 @@ endif endif NOUX_CONFIGURE_ARGS += --srcdir=$(NOUX_PKG_DIR) -NOUX_CONFIGURE_ARGS += --prefix $(PWD)/install +NOUX_CONFIGURE_ARGS += --prefix / CONFIG_GUESS_SCRIPT = $(NOUX_PKG_DIR)/config.guess) ifneq ($(wildcard $(CONFIG_GUESS_SCRIPT)),) @@ -173,7 +173,7 @@ noux_built.tag: noux_env.sh Makefile noux_installed.tag: noux_built.tag @$(MSG_INST)$(TARGET) - $(VERBOSE)$(MAKE) $(NOUX_MAKE_VERBOSE) install MAN= >> stdout.log 2>> stderr.log + $(VERBOSE)$(MAKE) $(NOUX_MAKE_VERBOSE) install DESTDIR=$(PWD)/install MAN= >> stdout.log 2>> stderr.log $(VERBOSE)rm -f $(INSTALL_DIR)/$(TARGET) $(VERBOSE)ln -sf $(PWD)/install $(INSTALL_DIR)/$(TARGET) @touch $@