*** empty log message ***

6 files changed, 45 insertions, 5 deletions

diff --git a/dyndns/INSTALL b/dyndns/INSTALL
index 800d5ad..7f8a24f 100644
--- a/dyndns/INSTALL
+++ b/dyndns/INSTALL
@@ -3,13 +3,16 @@
 # 1. Install the scripts and configuration:
 #
 mkdir -p /usr/local/lib/userv/dyndns /var/lib/userv/dyndns/tmp
-cp install service update /usr/local/lib/userv/dyndns
+cp install-script /usr/local/lib/userv/dyndns/install
+cp service update /usr/local/lib/userv/dyndns
 cp dyndns /etc/userv/services.d/dyndns.distrib
 cp dyndns-domains /etc/userv/dyndns-domains.example
 
 #    Rename the .distrib and .example, or edit them to be how you
 #    want, or merge your changes.
 #
+#    Create the service user `usdyndns'.
+#
 # 2. For each zone, create
 #      /var/lib/userv/zone,<zone-name-without-trailing-dot>/
 #    and put in it the file
diff --git a/dyndns/Makefile b/dyndns/Makefile
new file mode 100644
index 0000000..307008f
--- /dev/null
+++ b/dyndns/Makefile
@@ -0,0 +1,37 @@
+# Makefile
+# installation runes for userv-dyndns
+
+# Copyright (C) 2003 Ian Jackson
+#
+# This is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with userv-utils; if not, write to the Free Software
+# Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# $Id$
+
+include ../settings.make
+
+install:
+		mkdir -p $(shareuserv)/dyndns $(varlibuserv)/dyndns/tmp
+		cp service update $(shareuserv)/dyndns
+		cp install-script $(shareuserv)/dyndns/install
+
+install-examples:
+		mkdir -p $(services)
+		cp dyndns $(services)/dyndns.distrib
+		cp dyndns-domains $(etcuserv)/dyndns-domains.example
+		echo usdyndns >$(etcuserv)/dyndns-service-users.example
+
+install-docs:
+		mkdir -p $(docdir)/userv-dyndns
+		cp INSTALL $(docdir)/userv-dyndns
diff --git a/dyndns/dyndns b/dyndns/dyndns
index e73d793..95d3394 100644
--- a/dyndns/dyndns
+++ b/dyndns/dyndns
@@ -1,9 +1,9 @@
 if ( grep calling-user-shell /etc/shells
-   & glob service-user dyndns
+   & grep service-user /etc/userv/dyndns-service-users
    )
 	reset
 	no-set-environment
 	no-suppress-args
 	no-disconnect-hup
-	execute /usr/local/lib/userv/dyndns/service
+	execute /usr/share/userv/dyndns/service
 fi
diff --git a/dyndns/install b/dyndns/install-script
index 751bb72..751bb72 100755
--- a/dyndns/install
+++ b/dyndns/install-script
diff --git a/dyndns/service b/dyndns/service
index 65b58ef..f9a6bde 100755
--- a/dyndns/service
+++ b/dyndns/service
@@ -12,7 +12,7 @@ use POSIX;
 BEGIN {
     $vardir= "/var/lib/userv/dyndns";
     $defconf= "/etc/userv/dyndns-domains";
-    $libdir= "/usr/local/lib/userv/dyndns";
+    $libdir= "/usr/share/userv/dyndns";
 }
 END {
     remove "$vardir/tmp/$$" or $! == ENOENT or
diff --git a/dyndns/update b/dyndns/update
index 7a72503..5d334c1 100755
--- a/dyndns/update
+++ b/dyndns/update
@@ -48,4 +48,4 @@ echo $now $charge >$files,timings.new
 mv -f $files,timings.new $files,timings
 mv $files,new $files,data
 
-exec /usr/local/lib/userv/dyndns/install $zone
+exec /usr/share/userv/dyndns/install $zone