X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-python%2Favahi-discover%2FMakefile.am;h=d16bd11cae66f1e89b594cc9e3b4e4ea67dee794;hb=7a5b2f69af7d36d6cd4153142f125fa011784e03;hp=a44a071a502cc8aa9bb4f75798bb74478f484637;hpb=c3c0f3d47e49ab6814d4de3ee41a0c5caf0265b9;p=catta

diff --git a/avahi-python/avahi-discover/Makefile.am b/avahi-python/avahi-discover/Makefile.am
index a44a071..d16bd11 100644
--- 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,8 +19,7 @@ AM_CFLAGS=-I$(top_srcdir)
 
 EXTRA_DIST = \
 	__init__.py \
-	SimpleGladeApp.py \
-	avahi-discover.in \
+	avahi-discover.py \
 	avahi-discover.desktop.in.in
 
 if HAVE_PYTHON
@@ -32,7 +29,7 @@ if HAVE_PYGTK
 pythonscripts =
 
 desktopdir = $(datadir)/applications
-desktop_DATA = 
+desktop_DATA =
 
 avahi_discoverdir = $(pythondir)/avahi_discover
 avahi_discover_PYTHON =
@@ -42,7 +39,7 @@ pythonscripts += \
 	avahi-discover
 desktop_DATA += avahi-discover.desktop
 @INTLTOOL_DESKTOP_RULE@
-avahi_discover_PYTHON += __init__.py SimpleGladeApp.py
+avahi_discover_PYTHON += __init__.py
 endif
 
 if HAVE_DBM
@@ -50,17 +47,17 @@ pythonscripts += \
 	avahi-discover
 desktop_DATA += avahi-discover.desktop
 @INTLTOOL_DESKTOP_RULE@
-avahi_discover_PYTHON += __init__.py SimpleGladeApp.py
+avahi_discover_PYTHON += __init__.py
 endif
 
 avahi-discover.desktop.in: avahi-discover.desktop.in.in
-	sed -e 's,@bindir\@,$(bindir),g' $< > $@
+	$(AM_V_GEN)sed -e 's,@bindir\@,$(bindir),g' $< > $@
 
-avahi-discover: avahi-discover.in
-	sed -e 's,@PYTHON\@,$(PYTHON),g' \
+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,@interfacesdir\@,$(interfacesdir),g' $< > $@
+		-e 's,@LOCALEDIR\@,"$(avahilocaledir)",g' \
+		-e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@ && \
 	chmod +x $@
 
 bin_SCRIPTS = $(pythonscripts)