| Message ID | 1353404767-4495-2-git-send-email-xiawenc@linux.vnet.ibm.com |
|---|---|
| State | New |
| Headers | show |
On 20 November 2012 09:46, Wenchao Xia <xiawenc@linux.vnet.ibm.com> wrote: > Currently Makefile test if pixman have configure log, but the script directly > return error if that file do not exist. This patch fix it. > > v2: print out the command. We need this patch in 1.3 because otherwise 'distclean' barfs if you're using internal pixman. This would be clearer if it was a separate patch and not part of this libqblock series (which is not for 1.3 as far as I know). > Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> thanks -- PMM > --- > Makefile | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/Makefile b/Makefile > index 3e8d441..9ecbcbb 100644 > --- a/Makefile > +++ b/Makefile > @@ -286,7 +286,7 @@ distclean: clean > for d in $(TARGET_DIRS) $(QEMULIBS); do \ > rm -rf $$d || exit 1 ; \ > done > - test -f pixman/config.log && make -C pixman distclean > + if test -f pixman/config.log; then make -C pixman distclean; fi > > KEYMAPS=da en-gb et fr fr-ch is lt modifiers no pt-br sv \ > ar de en-us fi fr-be hr it lv nl pl ru th \ > -- > 1.7.1 >
δΊ 2012-11-22 6:54, Peter Maydell ει: > On 20 November 2012 09:46, Wenchao Xia <xiawenc@linux.vnet.ibm.com> wrote: >> Currently Makefile test if pixman have configure log, but the script directly >> return error if that file do not exist. This patch fix it. >> >> v2: print out the command. > > We need this patch in 1.3 because otherwise 'distclean' barfs > if you're using internal pixman. This would be clearer if it > was a separate patch and not part of this libqblock series > (which is not for 1.3 as far as I know). > >> Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com> > > Reviewed-by: Peter Maydell <peter.maydell@linaro.org> > > thanks > -- PMM > >> --- >> Makefile | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/Makefile b/Makefile >> index 3e8d441..9ecbcbb 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -286,7 +286,7 @@ distclean: clean >> for d in $(TARGET_DIRS) $(QEMULIBS); do \ >> rm -rf $$d || exit 1 ; \ >> done >> - test -f pixman/config.log && make -C pixman distclean >> + if test -f pixman/config.log; then make -C pixman distclean; fi >> >> KEYMAPS=da en-gb et fr fr-ch is lt modifiers no pt-br sv \ >> ar de en-us fi fr-be hr it lv nl pl ru th \ >> -- >> 1.7.1 >> > will sent a separate patch, thanks.
diff --git a/Makefile b/Makefile index 3e8d441..9ecbcbb 100644 --- a/Makefile +++ b/Makefile @@ -286,7 +286,7 @@ distclean: clean for d in $(TARGET_DIRS) $(QEMULIBS); do \ rm -rf $$d || exit 1 ; \ done - test -f pixman/config.log && make -C pixman distclean + if test -f pixman/config.log; then make -C pixman distclean; fi KEYMAPS=da en-gb et fr fr-ch is lt modifiers no pt-br sv \ ar de en-us fi fr-be hr it lv nl pl ru th \
Currently Makefile test if pixman have configure log, but the script directly return error if that file do not exist. This patch fix it. v2: print out the command. Signed-off-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com> --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)