From: Pavel Roskin <proski@gnu.org>
Date: Wed, 21 Dec 2005 17:10:57 GMT
Subject: [PATCH] qgit: remove Makefile from unpack_local_scons.sh
Message-ID: <1135185057.5602.31.camel@dv>

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 <proski@gnu.org>

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