From: Rod Whitby Date: Thu, 4 Aug 2005 00:47:50 +0000 (+0000) Subject: Stopped the setup target removing an existing intended local.conf X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a716813245202993b3567d052cd4e931704c1bb;p=openembedded.git Stopped the setup target removing an existing intended local.conf --- 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 )