* don't use autoconf to replace paths in avahi-utils. Use sed instead

* comment out sebest's pygtk stuff in configure.ac for now


git-svn-id: file:///home/lennart/svn/public/avahi/trunk@227 941a03a8-eaeb-0310-b9a0-b1bbd8fe43fe

5 files changed, 36 insertions, 11 deletions

diff --git a/avahi-utils/Makefile.am b/avahi-utils/Makefile.am
index c2c7842..0079795 100644
--- a/avahi-utils/Makefile.am
+++ b/avahi-utils/Makefile.am
@@ -19,12 +19,37 @@
 
 SUBDIRS=avahi
 
+pythonscripts = \
+	avahi-publish-address \
+	avahi-publish-service \
+	avahi-dump-all \
+	avahi-discover 
+
+EXTRA_DIST = \
+	avahi-publish-address.in \
+	avahi-publish-service.in \
+	avahi-dump-all.in \
+	avahi-discover.in 
+
 if HAVE_PYTHON
-bin_SCRIPTS = 			\
-	avahi-publish-address 	\
-	avahi-publish-service 	\
-	avahi-dump-all 		\
-	avahi-discover
+bin_SCRIPTS = $(pythonscripts)
 endif
 
-CLEANFILES = $(bin_SCRIPTS)
+avahi-publish-address: avahi-publish-address.in
+	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+	chmod +x $@
+
+avahi-publish-service: avahi-publish-service.in
+	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+	chmod +x $@
+
+avahi-dump-all: avahi-dump-all.in
+	sed -e 's,@PYTHON\@,$(PYTHON),g' $< > $@
+	chmod +x $@
+
+avahi-discover: avahi-discover.in
+	sed -e 's,@PYTHON\@,$(PYTHON),g' \
+		-e 's,@interfacesdir\@,$(interfacesdir),g' $< > $@
+	chmod +x $@
+
+CLEANFILES = $(pythonscripts)
diff --git a/avahi-utils/avahi-discover.in b/avahi-utils/avahi-discover.in
index fc518db..404d228 100755
--- a/avahi-utils/avahi-discover.in
+++ b/avahi-utils/avahi-discover.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON@
+#!@PYTHON@
 # -*-python-*-
 # $Id$
 
@@ -35,7 +35,7 @@ service_type_browsers = {}
 service_browsers = {}
 
 
-glade_dir = "@prefix@/share/@PACKAGE@/interfaces"
+glade_dir = "@interfacesdir@"
 
 class Main_window(SimpleGladeApp):
     def __init__(self, path="avahi-discover.glade", root="main_window", domain=None, **kwargs):
diff --git a/avahi-utils/avahi-dump-all.in b/avahi-utils/avahi-dump-all.in
index 94fcf42..ca61ebe 100755
--- a/avahi-utils/avahi-dump-all.in
+++ b/avahi-utils/avahi-dump-all.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON@
+#!@PYTHON@
 # -*-python-*-
 # $Id$ 
 
diff --git a/avahi-utils/avahi-publish-address.in b/avahi-utils/avahi-publish-address.in
index afa16e9..1942a69 100755
--- a/avahi-utils/avahi-publish-address.in
+++ b/avahi-utils/avahi-publish-address.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON@
+#!@PYTHON@
 # -*-python-*-
 # $Id$
 
diff --git a/avahi-utils/avahi-publish-service.in b/avahi-utils/avahi-publish-service.in
index 123e376..de25957 100755
--- a/avahi-utils/avahi-publish-service.in
+++ b/avahi-utils/avahi-publish-service.in
@@ -1,4 +1,4 @@
-#!/usr/bin/env @PYTHON@
+#!@PYTHON@
 # -*-python-*-
 # $Id$