[svn] commit: r1516 - in /trunk: configure.ac src/bin/xfrin/Makefile.am src/bin/xfrin/xfrin.pre.in src/bin/xfrin/xfrin.py.in src/bin/xfrin/xfrin.spec

[BIND 10 source code commits]

Author: each
Date: Thu Mar 18 16:10:46 2010
New Revision: 1516

Log:
Change xfrin to use $localstatedir/$package/zone.sqlite3 for the default
database file.

Added:
    trunk/src/bin/xfrin/xfrin.pre.in
      - copied, changed from r1512, trunk/src/bin/xfrin/xfrin.spec
Removed:
    trunk/src/bin/xfrin/xfrin.spec
Modified:
    trunk/configure.ac
    trunk/src/bin/xfrin/Makefile.am
    trunk/src/bin/xfrin/xfrin.py.in

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Thu Mar 18 16:10:46 2010
@@ -291,6 +291,7 @@
            src/bin/cmdctl/unittest/cmdctl_test
            src/bin/xfrin/unittest/xfrin_test
            src/bin/xfrin/xfrin.py
+           src/bin/xfrin/xfrin.pre
            src/bin/xfrin/run_b10-xfrin.sh
            src/bin/bind10/bind10.py
            src/bin/bind10/tests/bind10_test

Modified: trunk/src/bin/xfrin/Makefile.am
==============================================================================
--- trunk/src/bin/xfrin/Makefile.am (original)
+++ trunk/src/bin/xfrin/Makefile.am Thu Mar 18 16:10:46 2010
@@ -7,7 +7,7 @@
 
 EXTRA_DIST = xfrin.spec
 
-CLEANFILES=	b10-xfrin
+CLEANFILES = b10-xfrin xfrin.pre xfrin.spec
 
 man_MANS = b10-xfrin.8
 EXTRA_DIST += $(man_MANS) b10-xfrin.xml
@@ -19,8 +19,12 @@
 
 endif
 
+xfrin.spec: xfrin.pre
+	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.pre >$@
+
 # TODO: does this need $$(DESTDIR) also?
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 b10-xfrin: xfrin.py
-	$(SED) "s|@@PYTHONPATH@@|@pyexecdir@|" xfrin.py >$@
+	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
+	       -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.py >$@
 	chmod a+x $@

Modified: trunk/src/bin/xfrin/xfrin.py.in
==============================================================================
--- trunk/src/bin/xfrin/xfrin.py.in (original)
+++ trunk/src/bin/xfrin/xfrin.py.in Thu Mar 18 16:10:46 2010
@@ -384,7 +384,7 @@
         db_file = args.get('db_file')
         if not db_file:
             #TODO, the db file path should be got in auth server's configuration
-            db_file = '/tmp/zone.sqlite3'
+            db_file = '@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3'
 
         return (zone_name, master, port, db_file)