Commit c915e5be authored by Timothy Stack's avatar Timothy Stack

Small hack to get the right value of $prefix into config.h. If no

prefix is specified on the command line the value of $prefix when the
config.h is generated is 'NONE' instead of '/usr/testbed', so we have
to manually define it to the default ourselves.
parent f95e336d
...@@ -1006,10 +1006,17 @@ fi ...@@ -1006,10 +1006,17 @@ fi
# #
# Be sure to add to config.h.in! # Be sure to add to config.h.in!
# #
cat >> confdefs.h <<EOF if test x"$prefix" = x"NONE"; then
cat >> confdefs.h <<EOF
#define TBROOT "/usr/testbed"
EOF
else
cat >> confdefs.h <<EOF
#define TBROOT "$prefix" #define TBROOT "$prefix"
EOF EOF
fi
cat >> confdefs.h <<EOF cat >> confdefs.h <<EOF
#define TBDBNAME "$TBDBNAME" #define TBDBNAME "$TBDBNAME"
EOF EOF
...@@ -1401,7 +1408,7 @@ fi ...@@ -1401,7 +1408,7 @@ fi
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh. # ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
echo "configure:1405: checking for a BSD compatible install" >&5 echo "configure:1412: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
......
...@@ -193,7 +193,11 @@ fi ...@@ -193,7 +193,11 @@ fi
# #
# Be sure to add to config.h.in! # Be sure to add to config.h.in!
# #
AC_DEFINE_UNQUOTED(TBROOT, "$prefix") if test x"$prefix" = x"NONE"; then
AC_DEFINE_UNQUOTED(TBROOT, "/usr/testbed")
else
AC_DEFINE_UNQUOTED(TBROOT, "$prefix")
fi
AC_DEFINE_UNQUOTED(TBDBNAME, "$TBDBNAME") AC_DEFINE_UNQUOTED(TBDBNAME, "$TBDBNAME")
AC_DEFINE_UNQUOTED(TBADMINGROUP, "$TBADMINGROUP") AC_DEFINE_UNQUOTED(TBADMINGROUP, "$TBADMINGROUP")
AC_DEFINE_UNQUOTED(IPBASE, "$IPBASE") AC_DEFINE_UNQUOTED(IPBASE, "$IPBASE")
......
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