summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-08-04 00:47:50 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-08-04 00:47:50 +0000
commit5a716813245202993b3567d052cd4e931704c1bb (patch)
tree208ff4f86f596db636fc62efc84824993cabc478 /Makefile
parent95b82c054f0a3f98096d583bb2089646e383fbc6 (diff)
Stopped the setup target removing an existing intended local.conf
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 9c50396e34..9ea45aaf7c 100644
--- a/Makefile
+++ b/Makefile
@@ -92,7 +92,7 @@ setup-unslung setup-openslug setup-ucslugc: setup-%: MT/.configured
[ -e $*/bitbake ] || ( cd $* ; ln -s ../bitbake . )
[ -e $*/openembedded ] || ( cd $* ; ln -s ../openembedded . )
[ -d $*/conf ] || ( mkdir -p $*/conf )
- [ ! -f $*/conf/local.conf ] || ( cd $*/conf ; mv local.conf local.conf.delete-me )
+ [ ! -f $*/conf/local.conf -o -e $*/conf/auto.conf ] || ( cd $*/conf ; mv local.conf local.conf.delete-me )
[ -e $*/conf/local.conf.sample ] || ( cd $*/conf ; ln -s ../../common/conf/local.conf.sample . )
[ -e $*/conf/site.conf ] || ( cd $*/conf ; ln -s ../../common/conf/site.conf . )
[ ! -f $*/conf/auto.conf ] || ( cd $*/conf ; rm -f auto.conf )