From d716f075452aee0ea1dd17f3211ccb3087209f21 Mon Sep 17 00:00:00 2001
From: Sebastien Estienne <sebastien.estienne@gmail.com>
Date: Sun, 6 Aug 2006 18:43:38 +0000
Subject: * modification suggested by Padraig O'Briain
 <Padraig.Obriain@sun.com> to support sed with no -i option

git-svn-id: file:///home/lennart/svn/public/service-discovery-applet/trunk@111 3be567f1-68ff-0310-b24a-ad7cc433fd2f
---
 servers/GNOME_ServiceDiscoveryApplet.server.in    | 30 -----------------------
 servers/GNOME_ServiceDiscoveryApplet.server.in.in | 30 +++++++++++++++++++++++
 servers/Makefile.am                               | 11 +++++----
 3 files changed, 36 insertions(+), 35 deletions(-)
 delete mode 100644 servers/GNOME_ServiceDiscoveryApplet.server.in
 create mode 100644 servers/GNOME_ServiceDiscoveryApplet.server.in.in

diff --git a/servers/GNOME_ServiceDiscoveryApplet.server.in b/servers/GNOME_ServiceDiscoveryApplet.server.in
deleted file mode 100644
index bcf5276..0000000
--- a/servers/GNOME_ServiceDiscoveryApplet.server.in
+++ /dev/null
@@ -1,30 +0,0 @@
-<oaf_info>
-
-<oaf_server iid="OAFIID:GNOME_ServiceDiscoveryApplet_Factory"
-            type="exe"
-            location="@bindir@/service-discovery-applet">
-
-        <oaf_attribute name="repo_ids" type="stringv">
-                <item value="IDL:Bonobo/GenericFactory:1.0"/>
-                <item value="IDL:Bonobo/Unknown:1.0"/>
-        </oaf_attribute>
-        <oaf_attribute name="name" type="string" _value="Zeroconf Service Discovery"/>
-        <oaf_attribute name="description" type="string" _value="Show Zeroconf Services on your local network and allow accessing them easily"/>
-</oaf_server>
-
-<oaf_server iid="OAFIID:GNOME_ServiceDiscoveryApplet"
-            type="factory" 
-            location="OAFIID:GNOME_ServiceDiscoveryApplet_Factory">
-
-        <oaf_attribute name="repo_ids" type="stringv">
-                <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
-                <item value="IDL:Bonobo/Control:1.0"/>
-                <item value="IDL:Bonobo/Unknown:1.0"/>
-        </oaf_attribute>
-        <oaf_attribute name="name" type="string" _value="Zeroconf Service Discovery"/>
-        <oaf_attribute name="description" type="string" _value="Show Zeroconf Services on your local network and allow accessing them easily"/>
-        <oaf_attribute name="panel:category" type="string" value="Internet"/>
-        <oaf_attribute name="panel:icon" type="string" value="@iconsdir@/48x48/service-discovery-applet.png"/>
-</oaf_server>
-
-</oaf_info>
diff --git a/servers/GNOME_ServiceDiscoveryApplet.server.in.in b/servers/GNOME_ServiceDiscoveryApplet.server.in.in
new file mode 100644
index 0000000..bcf5276
--- /dev/null
+++ b/servers/GNOME_ServiceDiscoveryApplet.server.in.in
@@ -0,0 +1,30 @@
+<oaf_info>
+
+<oaf_server iid="OAFIID:GNOME_ServiceDiscoveryApplet_Factory"
+            type="exe"
+            location="@bindir@/service-discovery-applet">
+
+        <oaf_attribute name="repo_ids" type="stringv">
+                <item value="IDL:Bonobo/GenericFactory:1.0"/>
+                <item value="IDL:Bonobo/Unknown:1.0"/>
+        </oaf_attribute>
+        <oaf_attribute name="name" type="string" _value="Zeroconf Service Discovery"/>
+        <oaf_attribute name="description" type="string" _value="Show Zeroconf Services on your local network and allow accessing them easily"/>
+</oaf_server>
+
+<oaf_server iid="OAFIID:GNOME_ServiceDiscoveryApplet"
+            type="factory" 
+            location="OAFIID:GNOME_ServiceDiscoveryApplet_Factory">
+
+        <oaf_attribute name="repo_ids" type="stringv">
+                <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/>
+                <item value="IDL:Bonobo/Control:1.0"/>
+                <item value="IDL:Bonobo/Unknown:1.0"/>
+        </oaf_attribute>
+        <oaf_attribute name="name" type="string" _value="Zeroconf Service Discovery"/>
+        <oaf_attribute name="description" type="string" _value="Show Zeroconf Services on your local network and allow accessing them easily"/>
+        <oaf_attribute name="panel:category" type="string" value="Internet"/>
+        <oaf_attribute name="panel:icon" type="string" value="@iconsdir@/48x48/service-discovery-applet.png"/>
+</oaf_server>
+
+</oaf_info>
diff --git a/servers/Makefile.am b/servers/Makefile.am
index 6e10f91..e782b72 100644
--- a/servers/Makefile.am
+++ b/servers/Makefile.am
@@ -3,12 +3,13 @@ servers_in_files = GNOME_ServiceDiscoveryApplet.server.in
 servers_DATA = $(servers_in_files:.server.in=.server)
 @INTLTOOL_SERVER_RULE@
 
-all: GNOME_ServiceDiscoveryApplet.server
-	sed -i \
+GNOME_ServiceDiscoveryApplet.server.in: GNOME_ServiceDiscoveryApplet.server.in.in
+	sed \
 	-e 's,@bindir\@,$(bindir),g' \
 	-e 's,@iconsdir\@,$(ICONSDIR),g' \
-	GNOME_ServiceDiscoveryApplet.server
+	$< > $@
 
-EXTRA_DIST = GNOME_ServiceDiscoveryApplet.server.in
+EXTRA_DIST = GNOME_ServiceDiscoveryApplet.server.in.in
+
+CLEANFILES = $(servers_DATA) $(servers_in_files)
 
-CLEANFILES = $(servers_DATA)
-- 
cgit