X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=avahi-python%2Favahi%2FMakefile.am;h=081398631bdb4641144a878260b0d6a8fe74db51;hb=e98b5b0df0b6241a59a39cda8f78c7d8d4622881;hp=20864c3142db263eb2acd7a127dd1bc6c368fc5e;hpb=dc8c605b464a608ec330313c3c0812975069474c;p=catta

diff --git a/avahi-python/avahi/Makefile.am b/avahi-python/avahi/Makefile.am
index 20864c3..0813986 100644
--- a/avahi-python/avahi/Makefile.am
+++ b/avahi-python/avahi/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
@@ -17,48 +15,47 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA.
 
-EXTRA_DIST = __init__.py SimpleGladeApp.py ServiceTypeDatabase.py.in
+EXTRA_DIST = __init__.py ServiceTypeDatabase.py.in
+
+pkglibdatadir=$(prefix)/lib/avahi
 
 if HAVE_PYTHON
 
 avahidir = $(pythondir)/avahi
 
-
 if HAVE_GDBM
-avahi_SCRIPTS = ServiceTypeDatabase.py
+nodist_avahi_SCRIPTS = ServiceTypeDatabase.py
 
 ServiceTypeDatabase.py: ServiceTypeDatabase.py.in
-	sed -e 's,@PYTHON\@,$(PYTHON),g' \
+	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
 		-e 's,@DBM\@,gdbm,g' \
 		-e 's,@FIRST_KEY\@,key = self.db.firstkey(),g' \
 		-e 's,@CHECK_KEY\@,while key is not None:,g' \
-		-e 's,@NEXT_KEY\@,key = self.db.nextkey(),g' \
-		-e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@
+		-e 's,@NEXT_KEY\@,key = self.db.nextkey(key),g' \
+		-e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \
 	chmod +x $@
 endif
 
 if HAVE_DBM
-avahi_SCRIPTS = ServiceTypeDatabase.py
+nodist_avahi_SCRIPTS = ServiceTypeDatabase.py
 
 ServiceTypeDatabase.py: ServiceTypeDatabase.py.in
-	sed -e 's,@PYTHON\@,$(PYTHON),g' \
+	$(AM_V_GEN)sed -e 's,@PYTHON\@,$(PYTHON),g' \
 		-e 's,@DBM\@,dbm,g' \
 		-e 's,@FIRST_KEY\@,keys = self.db.keys(),g' \
 		-e 's,@CHECK_KEY\@,for key in keys:,g' \
 		-e 's,@NEXT_KEY\@,,g' \
-		-e 's,@pkgdatadir\@,$(pkgdatadir),g' $< > $@
+		-e 's,@pkglibdatadir\@,$(pkglibdatadir),g' $< > $@ && \
 	chmod +x $@
 endif
 
-if HAVE_PYGTK
+avahi_PYTHON = $(avahi_SCRIPTS)
+
 if HAVE_PYTHON_DBUS
 
-avahi_PYTHON = __init__.py SimpleGladeApp.py 
+avahi_PYTHON += __init__.py
 
-endif
 endif
 endif
 
 CLEANFILES=*.pyc *.pyo ServiceTypeDatabase.py
-
-