Commit 27b28e33 authored by Likun Zhang's avatar Likun Zhang
Browse files

Revert the revision 1853 which make trunk fail to build.

git-svn-id: svn://bind10.isc.org/svn/bind10/trunk@1854 e5f2f494-b856-4b98-b285-d166d9295462
parent 3afb8da3
...@@ -431,7 +431,7 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py ...@@ -431,7 +431,7 @@ AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
src/bin/msgq/tests/msgq_test src/bin/msgq/tests/msgq_test
src/bin/msgq/run_msgq.sh src/bin/msgq/run_msgq.sh
src/bin/auth/auth.spec.pre src/bin/auth/auth.spec.pre
src/bin/auth/spec_config.h.pre src/bin/auth/spec_config.h
src/lib/config/tests/data_def_unittests_config.h src/lib/config/tests/data_def_unittests_config.h
src/lib/python/isc/config/tests/config_test src/lib/python/isc/config/tests/config_test
src/lib/python/isc/cc/tests/cc_test src/lib/python/isc/cc/tests/cc_test
......
...@@ -23,9 +23,6 @@ endif ...@@ -23,9 +23,6 @@ endif
auth.spec: auth.spec.pre auth.spec: auth.spec.pre
$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" auth.spec.pre >$@ $(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" auth.spec.pre >$@
spec_config.h: spec_config.h.pre
$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" spec_config.h.pre >$@
pkglibexec_PROGRAMS = b10-auth pkglibexec_PROGRAMS = b10-auth
b10_auth_SOURCES = auth_srv.cc auth_srv.h b10_auth_SOURCES = auth_srv.cc auth_srv.h
b10_auth_SOURCES += common.h b10_auth_SOURCES += common.h
......
...@@ -13,4 +13,4 @@ ...@@ -13,4 +13,4 @@
// PERFORMANCE OF THIS SOFTWARE. // PERFORMANCE OF THIS SOFTWARE.
#define AUTH_SPECFILE_LOCATION "@prefix@/share/@PACKAGE@/auth.spec" #define AUTH_SPECFILE_LOCATION "@prefix@/share/@PACKAGE@/auth.spec"
#define UNIX_SOCKET_FILE "@@LOCALSTATEDIR@@/auth_xfrout_conn" #define UNIX_SOCKET_FILE "@prefix@/var/auth_xfrout_conn"
...@@ -44,7 +44,7 @@ else: ...@@ -44,7 +44,7 @@ else:
DATAROOTDIR = "@datarootdir@" DATAROOTDIR = "@datarootdir@"
SPECFILE_PATH = "@datadir@/@PACKAGE@".replace("${datarootdir}", DATAROOTDIR).replace("${prefix}", PREFIX) SPECFILE_PATH = "@datadir@/@PACKAGE@".replace("${datarootdir}", DATAROOTDIR).replace("${prefix}", PREFIX)
SPECFILE_LOCATION = SPECFILE_PATH + "/xfrout.spec" SPECFILE_LOCATION = SPECFILE_PATH + "/xfrout.spec"
UNIX_SOCKET_FILE = "@@LOCALSTATEDIR@@/auth_xfrout_conn" UNIX_SOCKET_FILE = "@localstatedir@".replace("${prefix}", PREFIX) + "/auth_xfrout_conn"
MAX_TRANSFERS_OUT = 10 MAX_TRANSFERS_OUT = 10
verbose_mode = False verbose_mode = False
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment