Commit e4c925e1 authored by Leigh B. Stoller's avatar Leigh B. Stoller

Add CLIENT install directory definitions to configure and to Makeconf.

These are the dirs to use on the client nodes, and should be used by
client-install targets in various makefiles.

Also add tmcd/common/GNUmakefile.in at the same time so that people do
not see errors config errors before I check it all in.
parent 2b5928ba
...@@ -50,3 +50,6 @@ INSTALL = @INSTALL@ ...@@ -50,3 +50,6 @@ INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL@ -m 755 INSTALL_PROGRAM = @INSTALL@ -m 755
INSTALL_DATA = @INSTALL@ -m 444 INSTALL_DATA = @INSTALL@ -m 444
CLIENT_ETCDIR = @CLIENT_ETCDIR@
CLIENT_BINDIR = @CLIENT_BINDIR@
CLIENT_VARDIR = @CLIENT_VARDIR@
...@@ -53,6 +53,7 @@ program_suffix=NONE ...@@ -53,6 +53,7 @@ program_suffix=NONE
program_transform_name=s,x,x, program_transform_name=s,x,x,
silent= silent=
site= site=
sitefile=
srcdir= srcdir=
target=NONE target=NONE
verbose= verbose=
...@@ -167,6 +168,7 @@ Configuration: ...@@ -167,6 +168,7 @@ Configuration:
--help print this message --help print this message
--no-create do not create output files --no-create do not create output files
--quiet, --silent do not print \`checking...' messages --quiet, --silent do not print \`checking...' messages
--site-file=FILE use FILE as the site file
--version print the version of autoconf that created configure --version print the version of autoconf that created configure
Directory and file names: Directory and file names:
--prefix=PREFIX install architecture-independent files in PREFIX --prefix=PREFIX install architecture-independent files in PREFIX
...@@ -337,6 +339,11 @@ EOF ...@@ -337,6 +339,11 @@ EOF
-site=* | --site=* | --sit=*) -site=* | --site=* | --sit=*)
site="$ac_optarg" ;; site="$ac_optarg" ;;
-site-file | --site-file | --site-fil | --site-fi | --site-f)
ac_prev=sitefile ;;
-site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*)
sitefile="$ac_optarg" ;;
-srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
ac_prev=srcdir ;; ac_prev=srcdir ;;
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
...@@ -502,12 +509,16 @@ fi ...@@ -502,12 +509,16 @@ fi
srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
# Prefer explicitly selected file to automatically selected ones. # Prefer explicitly selected file to automatically selected ones.
if test -z "$CONFIG_SITE"; then if test -z "$sitefile"; then
if test "x$prefix" != xNONE; then if test -z "$CONFIG_SITE"; then
CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" if test "x$prefix" != xNONE; then
else CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" else
CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
fi
fi fi
else
CONFIG_SITE="$sitefile"
fi fi
for ac_site_file in $CONFIG_SITE; do for ac_site_file in $CONFIG_SITE; do
if test -r "$ac_site_file"; then if test -r "$ac_site_file"; then
...@@ -575,7 +586,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } ...@@ -575,7 +586,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
fi fi
echo $ac_n "checking host system type""... $ac_c" 1>&6 echo $ac_n "checking host system type""... $ac_c" 1>&6
echo "configure:579: checking host system type" >&5 echo "configure:590: checking host system type" >&5
host_alias=$host host_alias=$host
case "$host_alias" in case "$host_alias" in
...@@ -596,7 +607,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` ...@@ -596,7 +607,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
echo "$ac_t""$host" 1>&6 echo "$ac_t""$host" 1>&6
echo $ac_n "checking build system type""... $ac_c" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6
echo "configure:600: checking build system type" >&5 echo "configure:611: checking build system type" >&5
build_alias=$build build_alias=$build
case "$build_alias" in case "$build_alias" in
...@@ -622,7 +633,7 @@ fi ...@@ -622,7 +633,7 @@ fi
# Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
set dummy ${ac_tool_prefix}gcc; ac_word=$2 set dummy ${ac_tool_prefix}gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:626: checking for $ac_word" >&5 echo "configure:637: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -654,7 +665,7 @@ fi ...@@ -654,7 +665,7 @@ fi
# Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args.
set dummy ${ac_tool_prefix}g++; ac_word=$2 set dummy ${ac_tool_prefix}g++; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:658: checking for $ac_word" >&5 echo "configure:669: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -686,7 +697,7 @@ fi ...@@ -686,7 +697,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
set dummy ${ac_tool_prefix}ar; ac_word=$2 set dummy ${ac_tool_prefix}ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:690: checking for $ac_word" >&5 echo "configure:701: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -718,7 +729,7 @@ fi ...@@ -718,7 +729,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ac_tool_prefix}ranlib; ac_word=$2 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:722: checking for $ac_word" >&5 echo "configure:733: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -750,7 +761,7 @@ fi ...@@ -750,7 +761,7 @@ fi
# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
set dummy ${ac_tool_prefix}strip; ac_word=$2 set dummy ${ac_tool_prefix}strip; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:754: checking for $ac_word" >&5 echo "configure:765: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -782,7 +793,7 @@ fi ...@@ -782,7 +793,7 @@ fi
# Extract the first word of "${ac_tool_prefix}ssh", so it can be a program name with args. # Extract the first word of "${ac_tool_prefix}ssh", so it can be a program name with args.
set dummy ${ac_tool_prefix}ssh; ac_word=$2 set dummy ${ac_tool_prefix}ssh; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
echo "configure:786: checking for $ac_word" >&5 echo "configure:797: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_SSH'+set}'`\" = set"; then if eval "test \"`echo '$''{'ac_cv_prog_SSH'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
else else
...@@ -841,6 +852,9 @@ fi ...@@ -841,6 +852,9 @@ fi
...@@ -849,6 +863,9 @@ fi ...@@ -849,6 +863,9 @@ fi
# Defaults for for above variables. # Defaults for for above variables.
# #
TBADMINGROUP="flux" TBADMINGROUP="flux"
CLIENT_ETCDIR="/etc/emulab"
CLIENT_BINDIR="/usr/local/etc/emulab"
CLIENT_VARDIR="/var/emulab"
# #
# Okay, I know this is improper usage of --with. Too bad. # Okay, I know this is improper usage of --with. Too bad.
...@@ -1184,7 +1201,7 @@ fi ...@@ -1184,7 +1201,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:1188: checking for a BSD compatible install" >&5 echo "configure:1205: 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
...@@ -1295,7 +1312,7 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -1295,7 +1312,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
tbsetup/sfskey_update tbsetup/sfskey_update.proxy \ tbsetup/sfskey_update tbsetup/sfskey_update.proxy \
tip/GNUmakefile \ tip/GNUmakefile \
tmcd/GNUmakefile tmcd/freebsd/GNUmakefile tmcd/linux/GNUmakefile \ tmcd/GNUmakefile tmcd/freebsd/GNUmakefile tmcd/linux/GNUmakefile \
tmcd/ron/GNUmakefile \ tmcd/ron/GNUmakefile tmcd/common/GNUmakefile \
tmcd/tmcd.restart \ tmcd/tmcd.restart \
utils/GNUmakefile utils/vlandiff utils/vlansync utils/delay_config \ utils/GNUmakefile utils/vlandiff utils/vlansync utils/delay_config \
utils/sshtb utils/create_image utils/node_admin utils/webcreateimage \ utils/sshtb utils/create_image utils/node_admin utils/webcreateimage \
...@@ -1494,6 +1511,9 @@ s%@UNIFIED_BOSS_AND_OPS@%$UNIFIED_BOSS_AND_OPS%g ...@@ -1494,6 +1511,9 @@ s%@UNIFIED_BOSS_AND_OPS@%$UNIFIED_BOSS_AND_OPS%g
s%@DISABLE_NSE@%$DISABLE_NSE%g s%@DISABLE_NSE@%$DISABLE_NSE%g
s%@DISABLE_NAMED_SETUP@%$DISABLE_NAMED_SETUP%g s%@DISABLE_NAMED_SETUP@%$DISABLE_NAMED_SETUP%g
s%@DISABLE_EVENT_SCHED@%$DISABLE_EVENT_SCHED%g s%@DISABLE_EVENT_SCHED@%$DISABLE_EVENT_SCHED%g
s%@CLIENT_ETCDIR@%$CLIENT_ETCDIR%g
s%@CLIENT_BINDIR@%$CLIENT_BINDIR%g
s%@CLIENT_VARDIR@%$CLIENT_VARDIR%g
s%@LEDA@%$LEDA%g s%@LEDA@%$LEDA%g
s%@ASSIGN@%$ASSIGN%g s%@ASSIGN@%$ASSIGN%g
s%@SSH_ARGS@%$SSH_ARGS%g s%@SSH_ARGS@%$SSH_ARGS%g
......
...@@ -45,11 +45,17 @@ AC_SUBST(UNIFIED_BOSS_AND_OPS) ...@@ -45,11 +45,17 @@ AC_SUBST(UNIFIED_BOSS_AND_OPS)
AC_SUBST(DISABLE_NSE) AC_SUBST(DISABLE_NSE)
AC_SUBST(DISABLE_NAMED_SETUP) AC_SUBST(DISABLE_NAMED_SETUP)
AC_SUBST(DISABLE_EVENT_SCHED) AC_SUBST(DISABLE_EVENT_SCHED)
AC_SUBST(CLIENT_ETCDIR)
AC_SUBST(CLIENT_BINDIR)
AC_SUBST(CLIENT_VARDIR)
# #
# Defaults for for above variables. # Defaults for for above variables.
# #
TBADMINGROUP="flux" TBADMINGROUP="flux"
CLIENT_ETCDIR="/etc/emulab"
CLIENT_BINDIR="/usr/local/etc/emulab"
CLIENT_VARDIR="/var/emulab"
# #
# Okay, I know this is improper usage of --with. Too bad. # Okay, I know this is improper usage of --with. Too bad.
...@@ -349,7 +355,7 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -349,7 +355,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
tbsetup/sfskey_update tbsetup/sfskey_update.proxy \ tbsetup/sfskey_update tbsetup/sfskey_update.proxy \
tip/GNUmakefile \ tip/GNUmakefile \
tmcd/GNUmakefile tmcd/freebsd/GNUmakefile tmcd/linux/GNUmakefile \ tmcd/GNUmakefile tmcd/freebsd/GNUmakefile tmcd/linux/GNUmakefile \
tmcd/ron/GNUmakefile \ tmcd/ron/GNUmakefile tmcd/common/GNUmakefile \
tmcd/tmcd.restart \ tmcd/tmcd.restart \
utils/GNUmakefile utils/vlandiff utils/vlansync utils/delay_config \ utils/GNUmakefile utils/vlandiff utils/vlansync utils/delay_config \
utils/sshtb utils/create_image utils/node_admin utils/webcreateimage \ utils/sshtb utils/create_image utils/node_admin utils/webcreateimage \
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
# All rights reserved.
#
#
# XXX ONLY RUN THIS INSTALL ON A TESTBED NODE!
#
# These things need to be installed into the right place on a testbed
# node before cutting an image. This directory is installed first,
# followed by the system-specific directory.
#
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../..
SUBDIR = tmcd/common
include $(OBJDIR)/Makeconf
all:
include $(TESTBED_SRCDIR)/GNUmakerules
DESTDIR =
ETCDIR = $(DESTDIR)$(CLIENT_ETCDIR)
BINDIR = $(DESTDIR)$(CLIENT_BINDIR)
VARDIR = $(DESTDIR)$(CLIENT_VARDIR)
RCDIR = $(DESTDIR)/usr/local/etc/rc.d
INSTALL = /usr/bin/install -c
install:
@echo "You should probably not run this install directly!"
@echo -n "If you do, be sure to install from the system specific "
@echo "directory afterwards."
local-install: path-install script-install other-install
$(INSTALL) -m 755 $(SRCDIR)/../freebsd/liblocsetup.pm \
$(BINDIR)/liblocsetup.pm
other-install:
(cd ../../os; $(MAKE) client-install)
dir-install:
$(INSTALL) -m 755 -o root -g wheel -d $(ETCDIR)
$(INSTALL) -m 755 -o root -g wheel -d $(BINDIR)
$(INSTALL) -m 755 -o root -g wheel -d $(RCDIR)
$(INSTALL) -m 755 -o root -g wheel -d $(VARDIR)
$(INSTALL) -m 755 -o root -g wheel -d $(VARDIR)/db
$(INSTALL) -m 755 -o root -g wheel -d $(VARDIR)/jails
$(INSTALL) -m 755 -o root -g wheel -d $(VARDIR)/logs
$(INSTALL) -m 755 -o root -g wheel -d $(VARDIR)/boot
path-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/paths.pm $(ETCDIR)/paths.pm
$(INSTALL) -m 755 $(SRCDIR)/paths.sh $(ETCDIR)/paths.sh
script-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/../libsetup.pm $(BINDIR)/libsetup.pm
$(INSTALL) -m 755 $(SRCDIR)/ntpstart $(BINDIR)/ntpstart
$(INSTALL) -m 755 $(SRCDIR)/runstartup $(BINDIR)/runstartup
$(INSTALL) -m 755 $(SRCDIR)/runcvsup.sh $(BINDIR)/runcvsup.sh
$(INSTALL) -m 755 $(SRCDIR)/bootsetup $(BINDIR)/bootsetup
$(INSTALL) -m 755 $(SRCDIR)/sendevent $(BINDIR)/sendevent
$(INSTALL) -m 755 $(SRCDIR)/rc.testbed $(BINDIR)/rc.testbed
$(INSTALL) -m 755 $(SRCDIR)/rc.agents $(BINDIR)/rc.agents
$(INSTALL) -m 755 $(SRCDIR)/rc.delta $(BINDIR)/rc.delta
$(INSTALL) -m 755 $(SRCDIR)/rc.progagent $(BINDIR)/rc.progagent
$(INSTALL) -m 755 $(SRCDIR)/rc.setup $(BINDIR)/rc.setup
$(INSTALL) -m 755 $(SRCDIR)/update $(BINDIR)/update
$(INSTALL) -m 755 $(SRCDIR)/vnodesetup $(BINDIR)/vnodesetup
chown root $(BINDIR)/vnodesetup
chmod u+s $(BINDIR)/vnodesetup
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