[svn] commit: r2909 - in /branches/trac329: configure.ac src/bin/xfrin/Makefile.am src/bin/xfrin/xfrin.spec src/bin/xfrin/xfrin.spec.pre.in

[BIND 10 source code commits]

Author: zhanglikun
Date: Tue Sep 14 09:45:24 2010
New Revision: 2909

Log:
Remove the parameter 'db_file' for command 'retransfer' of xfrin module, and xfrin.spec will not be generated by script.

Added:
    branches/trac329/src/bin/xfrin/xfrin.spec
      - copied, changed from r2884, branches/trac329/src/bin/xfrin/xfrin.spec.pre.in
Removed:
    branches/trac329/src/bin/xfrin/xfrin.spec.pre.in
Modified:
    branches/trac329/configure.ac
    branches/trac329/src/bin/xfrin/Makefile.am

Modified: branches/trac329/configure.ac
==============================================================================
--- branches/trac329/configure.ac (original)
+++ branches/trac329/configure.ac Tue Sep 14 09:45:24 2010
@@ -468,7 +468,6 @@
            src/bin/cmdctl/cmdctl.spec.pre
            src/bin/xfrin/tests/xfrin_test
            src/bin/xfrin/xfrin.py
-           src/bin/xfrin/xfrin.spec.pre
            src/bin/xfrin/run_b10-xfrin.sh
            src/bin/xfrout/xfrout.py
            src/bin/xfrout/xfrout.spec.pre

Modified: branches/trac329/src/bin/xfrin/Makefile.am
==============================================================================
--- branches/trac329/src/bin/xfrin/Makefile.am (original)
+++ branches/trac329/src/bin/xfrin/Makefile.am Tue Sep 14 09:45:24 2010
@@ -7,7 +7,7 @@
 b10_xfrindir = $(DESTDIR)$(pkgdatadir)
 b10_xfrin_DATA = xfrin.spec
 
-CLEANFILES = b10-xfrin xfrin.pyc xfrin.spec
+CLEANFILES = b10-xfrin xfrin.pyc 
 
 man_MANS = b10-xfrin.8
 EXTRA_DIST = $(man_MANS) b10-xfrin.xml
@@ -19,9 +19,6 @@
 
 endif
 
-xfrin.spec: xfrin.spec.pre
-	$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" xfrin.spec.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