main: don't abort if daemon_close_all() cannot close valgrind fds

[catta] / avahi-python / avahi-discover / Makefile.am

diff --git a/avahi-python/avahi-discover/Makefile.am b/avahi-python/avahi-discover/Makefile.am
index a493a253b64d6de334b030269146c26aa2bd7ee3..d16bd11cae66f1e89b594cc9e3b4e4ea67dee794 100644 (file)
--- a/avahi-python/avahi-discover/Makefile.am
+++ b/avahi-python/avahi-discover/Makefile.am
@@ -1,5 +1,3 @@
-# $Id$
-
 # This file is part of avahi.
 #
 # avahi is free software; you can redistribute it and/or modify it
@@ -21,7 +19,7 @@ AM_CFLAGS=-I$(top_srcdir)
 
 EXTRA_DIST = \
        __init__.py \
-       avahi-discover.in \
+       avahi-discover.py \
        avahi-discover.desktop.in.in
 
 if HAVE_PYTHON
@@ -31,7 +29,7 @@ if HAVE_PYGTK
 pythonscripts =
 
 desktopdir = $(datadir)/applications
-desktop_DATA = 
+desktop_DATA =
 
 avahi_discoverdir = $(pythondir)/avahi_discover
 avahi_discover_PYTHON =
@@ -55,10 +53,10 @@ endif
 avahi-discover.desktop.in: avahi-discover.desktop.in.in
        $(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
-avahi-discover: avahi-discover.in
+avahi-discover: avahi-discover.py
        $(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
                -e 's,@GETTEXT_PACKAGE\@,"$(GETTEXT_PACKAGE)",g' \
-               -e 's,@LOCALEDIR\@,"$(datadir)/locale",g' \
+               -e 's,@LOCALEDIR\@,"$(avahilocaledir)",g' \
                -e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@ && \
        chmod +x $@