diff options
| author | Kyle McMartin <kyle@shortfin.cabal.ca> | 2007-10-20 18:31:33 +0200 |
|---|---|---|
| committer | Kyle McMartin <kyle@shortfin.cabal.ca> | 2007-10-20 18:31:33 +0200 |
| commit | f67d4033c143d74fff3a9aff03772d912b1ec317 (patch) | |
| tree | a354d64bee1eaabead926c1496022d6db35aab92 | |
| parent | [PARISC] Zap unused variable warnings in pci.c (diff) | |
| download | linux-f67d4033c143d74fff3a9aff03772d912b1ec317.tar.xz linux-f67d4033c143d74fff3a9aff03772d912b1ec317.zip | |
[PARISC] Make palo target work when $obj != $src
Stumbled upon when I was testing it out and using
make O=... to build.
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
| -rw-r--r-- | arch/parisc/Makefile | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile index 7ecb5345378a..ae4a9b3d4fd6 100644 --- a/arch/parisc/Makefile +++ b/arch/parisc/Makefile @@ -78,20 +78,24 @@ PALO := $(shell if which palo; then : ; \ elif [ -x /sbin/palo ]; then echo /sbin/palo; \ fi) +PALOCONF := $(shell if [ -f $(src)/palo.conf ]; then echo $(src)/palo.conf; \ + else echo $(obj)/palo.conf; \ + fi) + palo: vmlinux - @if test ! -x $(PALO); then \ + @if test ! -x "$(PALO)"; then \ echo 'ERROR: Please install palo first (apt-get install palo)';\ echo 'or build it from source and install it somewhere in your $$PATH';\ false; \ fi - @if test ! -f ./palo.conf; then \ - cp arch/parisc/defpalo.conf palo.conf; \ - echo 'A generic palo config file (./palo.conf) has been created for you.'; \ + @if test ! -f "$(PALOCONF)"; then \ + cp $(src)/arch/parisc/defpalo.conf $(obj)/palo.conf; \ + echo 'A generic palo config file ($(obj)/palo.conf) has been created for you.'; \ echo 'You should check it and re-run "make palo".'; \ echo 'WARNING: the "lifimage" file is now placed in this directory by default!'; \ false; \ fi - $(PALO) -f ./palo.conf + $(PALO) -f $(PALOCONF) # Shorthands for known targets not supported by parisc, use vmlinux as default Image zImage bzImage: vmlinux |