summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKyle McMartin <kyle@shortfin.cabal.ca>2007-10-20 09:31:33 -0700
committerKyle McMartin <kyle@shortfin.cabal.ca>2007-10-20 09:31:33 -0700
commitf67d4033c143d74fff3a9aff03772d912b1ec317 (patch)
treea354d64bee1eaabead926c1496022d6db35aab92 /arch
parent7425ada2d07b0bdc082f34069eadbbe5a8e465d2 (diff)
downloadop-kernel-dev-f67d4033c143d74fff3a9aff03772d912b1ec317.zip
op-kernel-dev-f67d4033c143d74fff3a9aff03772d912b1ec317.tar.gz
[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>
Diffstat (limited to 'arch')
-rw-r--r--arch/parisc/Makefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 7ecb5345..ae4a9b3 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
OpenPOWER on IntegriCloud