Stopped the setup target removing an existing intended local.conf
authorRod Whitby <rod@whitby.id.au>
Thu, 4 Aug 2005 00:47:50 +0000 (00:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Aug 2005 00:47:50 +0000 (00:47 +0000)
Makefile

index 9c50396..9ea45aa 100644 (file)
--- 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 )