[svn] commit: r2944 - in /branches/trac302/src/bin/bind10: Makefile.am bind10.py.in

[BIND 10 source code commits]

Author: jreed
Date: Thu Sep 16 17:36:05 2010
New Revision: 2944

Log:
@PACKAGE_VERSION@ macro is already handled by ./configure

Modified:
    branches/trac302/src/bin/bind10/Makefile.am
    branches/trac302/src/bin/bind10/bind10.py.in

Modified: branches/trac302/src/bin/bind10/Makefile.am
==============================================================================
--- branches/trac302/src/bin/bind10/Makefile.am (original)
+++ branches/trac302/src/bin/bind10/Makefile.am Thu Sep 16 17:36:05 2010
@@ -23,7 +23,6 @@
 # this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
 bind10: bind10.py
 	$(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
-	       -e "s|@@PACKAGE_VERSION@@|$(PACKAGE_VERSION)|" \
 	       -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bind10.py >$@
 	chmod a+x $@
 

Modified: branches/trac302/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/trac302/src/bin/bind10/bind10.py.in (original)
+++ branches/trac302/src/bin/bind10/bind10.py.in Thu Sep 16 17:36:05 2010
@@ -67,7 +67,7 @@
 # This is the version that gets displayed to the user.
 # The VERSION string consists of the module name, the module version
 # number, and the overall BIND 10 version number (set in configure.ac).
-VERSION = "bind10 20100816 (BIND 10 @@PACKAGE_VERSION@@)"
+VERSION = "bind10 20100816 (BIND 10 @PACKAGE_VERSION@)"
 
 class RestartSchedule:
     """