[avahi] [PATCH] avahi-0.6.31: fix avahi-python Makefile for install target without DESTDIR (v2)

[Guido Trentalancia]

Intended to fix installation error for avahi version 0.6.31 when DESTDIR
is not defined.

Version2: fix a typo in previously submitted patch (missing "\" at the
end of line after the else statement) and fix the order of commands in
the if statement. Add a similar modification for avahi-discover.

Intended to fix installation error for avahi version 0.6.31 when DESTDIR is not defined.

Version2: fix a typo in previously submitted patch (missing "\").

--- avahi-0.6.31-orig/avahi-python/avahi/Makefile.in	2012-02-14 23:36:37.346061317 +0100
+++ avahi-0.6.31/avahi-python/avahi/Makefile.in	2012-02-18 04:32:32.474681328 +0100
@@ -456,8 +456,12 @@ install-avahiPYTHON: $(avahi_PYTHON)
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(avahidir)" || exit $$?; \
 	done || exit $$?; \
 	if test -n "$$dlist"; then \
-	  $(am__py_compile) --destdir "$(DESTDIR)" \
-	                    --basedir "$(avahidir)" $$dlist; \
+	  if test -z "$(DESTDIR)"; then \
+	    $(am__py_compile) --basedir "$(avahidir)" $$dlist; \
+	  else \
+	    $(am__py_compile) --destdir "$(DESTDIR)" \
+			      --basedir "$(avahidir)" $$dlist; \
+	  fi; \
 	else :; fi
 
 uninstall-avahiPYTHON:
--- avahi-0.6.31-orig/avahi-python/avahi-discover/Makefile.in	2012-02-14 23:36:37.265061040 +0100
+++ avahi-0.6.31/avahi-python/avahi-discover/Makefile.in	2012-02-18 05:10:00.632755343 +0100
@@ -477,8 +477,12 @@ install-avahi_discoverPYTHON: $(avahi_di
 	  $(INSTALL_DATA) $$files "$(DESTDIR)$(avahi_discoverdir)" || exit $$?; \
 	done || exit $$?; \
 	if test -n "$$dlist"; then \
-	  $(am__py_compile) --destdir "$(DESTDIR)" \
-	                    --basedir "$(avahi_discoverdir)" $$dlist; \
+	  if test -z "$(DESTDIR)"; then \
+	    $(am__py_compile) --basedir "$(avahi_discoverdir)" $$dlist; \
+	  else \
+	    $(am__py_compile) --destdir "$(DESTDIR)" \
+			      --basedir "$(avahi_discoverdir)" $$dlist; \
+	  fi; \
 	else :; fi
 
 uninstall-avahi_discoverPYTHON: