summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 785a0acc26..23acb086ca 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,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 )