SF.net SVN: gar:[24626] csw/mgar/gar/v2/gar.lib.mk

dmichelsen at users.sourceforge.net dmichelsen at users.sourceforge.net
Mon Feb 9 11:18:40 CET 2015


Revision: 24626
          http://sourceforge.net/p/gar/code/24626
Author:   dmichelsen
Date:     2015-02-09 10:18:39 +0000 (Mon, 09 Feb 2015)
Log Message:
-----------
mGAR v2: Skip DESTDIR if it is in NO_CONFIGURE_EXPORTS

Modified Paths:
--------------
    csw/mgar/gar/v2/gar.lib.mk

Modified: csw/mgar/gar/v2/gar.lib.mk
===================================================================
--- csw/mgar/gar/v2/gar.lib.mk	2015-02-09 09:39:29 UTC (rev 24625)
+++ csw/mgar/gar/v2/gar.lib.mk	2015-02-09 10:18:39 UTC (rev 24626)
@@ -1002,17 +1002,17 @@
 # just run make install and hope for the best.
 install-%/Makefile:
 	@echo " ==> Running make install in $*"
-	@cd $* && /usr/bin/env -i $(INSTALL_ENV) MAKEFLAGS= $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install
+	@cd $* && /usr/bin/env -i $(INSTALL_ENV) MAKEFLAGS= $(MAKE) $(foreach TTT,$(filter-out $(NO_CONFIGURE_EXPORTS),DESTDIR $(INSTALL_OVERRIDE_VARS)),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install
 	@$(MAKECOOKIE)
 
 install-%/makefile:
 	@echo " ==> Running make install in $*"
-	@cd $* && $(INSTALL_ENV) MAKEFLAGS= $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install
+	@cd $* && $(INSTALL_ENV) MAKEFLAGS= $(MAKE) $(foreach TTT,$(filter-out $(NO_CONFIGURE_EXPORTS),DESTDIR $(INSTALL_OVERRIDE_VARS)),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install
 	@$(MAKECOOKIE)
 
 install-%/GNUmakefile:
 	@echo " ==> Running make install in $*"
-	@cd $* && $(INSTALL_ENV) MAKEFLAGS= $(MAKE) DESTDIR=$(DESTDIR) $(foreach TTT,$(INSTALL_OVERRIDE_VARS),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install
+	@cd $* && $(INSTALL_ENV) MAKEFLAGS= $(MAKE) $(foreach TTT,$(filter-out $(NO_CONFIGURE_EXPORTS),DESTDIR $(INSTALL_OVERRIDE_VARS)),$(TTT)="$(INSTALL_OVERRIDE_VAR_$(TTT))") $(foreach TTT,$(INSTALL_OVERRIDE_DIRS),$(TTT)="$(DESTDIR)$($(TTT))") -C $(OBJDIR) $(INSTALL_ARGS) install
 	@$(MAKECOOKIE)
 
 # Ruby makefiles

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list