aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKyle McMartin <kyle@shortfin.cabal.ca>2007-10-20 12:31:33 -0400
committerKyle McMartin <kyle@shortfin.cabal.ca>2007-10-20 12:31:33 -0400
commitf67d4033c143d74fff3a9aff03772d912b1ec317 (patch)
treea354d64bee1eaabead926c1496022d6db35aab92
parent7425ada2d07b0bdc082f34069eadbbe5a8e465d2 (diff)
[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/Makefile14
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 : ; \
78 elif [ -x /sbin/palo ]; then echo /sbin/palo; \ 78 elif [ -x /sbin/palo ]; then echo /sbin/palo; \
79 fi) 79 fi)
80 80
81PALOCONF := $(shell if [ -f $(src)/palo.conf ]; then echo $(src)/palo.conf; \
82 else echo $(obj)/palo.conf; \
83 fi)
84
81palo: vmlinux 85palo: vmlinux
82 @if test ! -x $(PALO); then \ 86 @if test ! -x "$(PALO)"; then \
83 echo 'ERROR: Please install palo first (apt-get install palo)';\ 87 echo 'ERROR: Please install palo first (apt-get install palo)';\
84 echo 'or build it from source and install it somewhere in your $$PATH';\ 88 echo 'or build it from source and install it somewhere in your $$PATH';\
85 false; \ 89 false; \
86 fi 90 fi
87 @if test ! -f ./palo.conf; then \ 91 @if test ! -f "$(PALOCONF)"; then \
88 cp arch/parisc/defpalo.conf palo.conf; \ 92 cp $(src)/arch/parisc/defpalo.conf $(obj)/palo.conf; \
89 echo 'A generic palo config file (./palo.conf) has been created for you.'; \ 93 echo 'A generic palo config file ($(obj)/palo.conf) has been created for you.'; \
90 echo 'You should check it and re-run "make palo".'; \ 94 echo 'You should check it and re-run "make palo".'; \
91 echo 'WARNING: the "lifimage" file is now placed in this directory by default!'; \ 95 echo 'WARNING: the "lifimage" file is now placed in this directory by default!'; \
92 false; \ 96 false; \
93 fi 97 fi
94 $(PALO) -f ./palo.conf 98 $(PALO) -f $(PALOCONF)
95 99
96# Shorthands for known targets not supported by parisc, use vmlinux as default 100# Shorthands for known targets not supported by parisc, use vmlinux as default
97Image zImage bzImage: vmlinux 101Image zImage bzImage: vmlinux