diff options
| author | Rod Whitby <rod@whitby.id.au> | 2005-08-04 00:47:58 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-04 00:47:58 +0000 |
| commit | d6176d16a2ff57511f229301c8206d938de79215 (patch) | |
| tree | a7812c73dd00bacd58883c95993f1f73e7dd19bc | |
| parent | aeb8715da4be5c1d40f54be366316e66394f0692 (diff) | |
| parent | 5a716813245202993b3567d052cd4e931704c1bb (diff) | |
merge of 40be5a90a4f27ecdfe881b399fe0898cbff584a2
and 49bd102cddb83f75d9def61e0de89a2403e6e48d
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 ) |