Ticket #302: bind10.2.diff

File bind10.2.diff, 1.5 KB (added by jreed, 9 years ago)
  • Makefile.am

     
    2323# this is done here since configure.ac AC_OUTPUT doesn't expand exec_prefix
    2424bind10: bind10.py
    2525        $(SED) -e "s|@@PYTHONPATH@@|@pyexecdir@|" \
     26               -e "s|@@PACKAGE_VERSION@@|$(PACKAGE_VERSION)|" \
    2627               -e "s|@@LIBEXECDIR@@|$(pkglibexecdir)|" bind10.py >$@
    2728        chmod a+x $@
    2829
  • bind10.py.in

     
    6565import isc.cc
    6666
    6767# This is the version that gets displayed to the user.
    68 __version__ = "v20100531"
     68__version__ = "20100809"
     69version = "bind10 " + __version__ + " (BIND 10 @@PACKAGE_VERSION@@)"
    6970
    7071class RestartSchedule:
    7172    """
     
    605606
    606607
    607608    # Parse any command-line options.
    608     parser = OptionParser(version=__version__)
     609    parser = OptionParser(version=version)
    609610    parser.add_option("-a", "--address", dest="address", type="string",
    610611                      action="callback", callback=check_addr, default='',
    611612                      help="address the b10-auth daemon will use (default: listen on all addresses)")
     
    658659
    659660    # Announce startup.
    660661    if options.verbose:
    661         sys.stdout.write("BIND 10 %s\n" % __version__)
     662        sys.stdout.write("%s\n" % version)
    662663
    663664    # TODO: set process name, perhaps by:
    664665    #       http://code.google.com/p/procname/