---

yaml
---
r: 71927
b: refs/heads/master
c: f67d403
h: refs/heads/master
i:
  71925: 68a7114
  71923: dc792c9
  71919: d76324c
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7425ada2d07b0bdc082f34069eadbbe5a8e465d2
+refs/heads/master: f67d4033c143d74fff3a9aff03772d912b1ec317

trunk/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