From mboxrd@z Thu Jan 1 00:00:00 1970 From: Pavel Roskin Subject: [PATCH] qgit: remove Makefile from unpack_local_scons.sh Date: Wed, 21 Dec 2005 12:10:57 -0500 Message-ID: <1135185057.5602.31.camel@dv> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: git X-From: git-owner@vger.kernel.org Wed Dec 21 18:14:18 2005 Return-path: Received: from vger.kernel.org ([209.132.176.167]) by ciao.gmane.org with esmtp (Exim 4.43) id 1Ep7UY-0007Fw-P5 for gcvg-git@gmane.org; Wed, 21 Dec 2005 18:11:07 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932477AbVLURLD (ORCPT ); Wed, 21 Dec 2005 12:11:03 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932481AbVLURLD (ORCPT ); Wed, 21 Dec 2005 12:11:03 -0500 Received: from fencepost.gnu.org ([199.232.76.164]:51593 "EHLO fencepost.gnu.org") by vger.kernel.org with ESMTP id S932477AbVLURLA (ORCPT ); Wed, 21 Dec 2005 12:11:00 -0500 Received: from proski by fencepost.gnu.org with local (Exim 4.34) id 1Ep7SR-0006sV-Mn for git@vger.kernel.org; Wed, 21 Dec 2005 12:08:55 -0500 Received: from proski by dv.roinet.com with local (Exim 4.54) id 1Ep7UP-0001Fa-EH; Wed, 21 Dec 2005 12:10:57 -0500 To: Marco Costalba X-Mailer: Evolution 2.4.1 (2.4.1-5) Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: unpack_local_scons.sh would install a modified version of Makefile. However, the existing Makefile can be changed to detect and use local scons automatically. Signed-off-by: Pavel Roskin diff --git a/Makefile b/Makefile index 5fc9678..193153a 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,11 @@ ## Makefile automatically generated by unpack_local_scons.sh -### To use scons when installed globally use -SCONS=scons +### Use local scons if available +ifneq (,$(wildcard scons)) +SCONS = ./scons +else +SCONS = scons +endif ### To run the local version instead, define #SCONS=python scons.py diff --git a/unpack_local_scons.sh b/unpack_local_scons.sh index a1266fc..445cab2 100755 --- a/unpack_local_scons.sh +++ b/unpack_local_scons.sh @@ -13,46 +13,6 @@ NORMAL="\033[0m" # if kde is there a recent tar should be too tar xjvf scons-mini.tar.bz2 -cat > Makefile << EOF -## Makefile automatically generated by unpack_local_scons.sh - -### To use scons when installed globally use -#SCONS=scons -### To run the local version instead, define -SCONS=./scons - -# scons : compile -# scons -c : clean -# scons install : install -# scons -c install : uninstall and clean - -# default target : use scons to build the programs -all: - \$(SCONS) -Q - -### There are several possibilities to help debugging : -# scons --debug=explain, scons --debug=tree .. -# -### To optimize the runtime, use -# scons --max-drift=1 --implicit-deps-unchanged -debug: - \$(SCONS) -Q --debug=tree - -clean: - \$(SCONS) -c - -install: - \$(SCONS) install - -uninstall: - \$(SCONS) -c install - -## this target creates a tarball of the project -dist: - \$(SCONS) dist -EOF - - echo "" echo -e $GREEN"A minimum scons distribution has been unpacked right here" echo -e $GREEN"you can now run : "$NORMAL -- Regards, Pavel Roskin