Commit 8a244d09 authored by Srikanth Raju's avatar Srikanth Raju Committed by Leigh Stoller

More autotools fixes to deploy the export script

parent a7e23a69
......@@ -838,6 +838,7 @@ NODE_USAGE_SUPPORT
NOSTACKMIB
EXP_VIS_SUPPORT
NOSHAREDFS
IMPORT_TMPDIR
SELFLOADER_DATA
TBUSEDBI
NEEDMCQUERIER
......@@ -5089,6 +5090,8 @@ done
......@@ -5194,6 +5197,7 @@ NODE_USAGE_SUPPORT=0
EXP_VIS_SUPPORT=0
NOSTACKMIB=0
NOSHAREDFS=0
IMPORT_TMPDIR="/q"
NFSRACY=1
SELFLOADER_DATA="__DATA__"
NEEDMCQUERIER=0
......@@ -5522,6 +5526,10 @@ if test $PROTOGENI_GENIRACK -eq 1; then
_ACEOF
fi
cat >>confdefs.h <<_ACEOF
#define IMPORT_TMPDIR "$IMPORT_TMPDIR"
_ACEOF
LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z`
cat >>confdefs.h <<_ACEOF
......
......@@ -546,6 +546,7 @@ fi
if test $PROTOGENI_GENIRACK -eq 1; then
AC_DEFINE_UNQUOTED(PROTOGENI_GENIRACK, 1)
fi
AC_DEFINE_UNQUOTED(IMPORT_TMPDIR, "$IMPORT_TMPDIR")
LOG_TESTBED=`echo "LOG_$TBLOGFACIL" | tr a-z A-Z`
AC_DEFINE_UNQUOTED(LOG_TESTBED, $LOG_TESTBED)
......
......@@ -60,7 +60,8 @@ WEB_BIN_SCRIPTS = webcreate_image websetdest weblinkmon_ctl webspewevents \
LIBEXEC_SCRIPTS = spewleds webcopy spewsource webcvsweb xlogin webviewvc \
$(WEB_BIN_SCRIPTS) $(WEB_SBIN_SCRIPTS)
CTRLSBIN_SCRIPTS= opsdb_control.proxy daemon_wrapper ec2import.proxy
CTRLSBIN_SCRIPTS= opsdb_control.proxy daemon_wrapper ec2import.proxy \
ec2import-image.pl GrubConf.rb export-template-remote.rb
# These scripts installed setuid, with sudo.
SETUID_BIN_SCRIPTS = create_image
......
......@@ -51,7 +51,7 @@ use libsetup;
# Configure variables
#
my $TB = "@prefix@";
my $IMPORT_BASE = "@IMPORT_TMPDIR@"
my $IMPORT_BASE = "@IMPORT_TMPDIR@";
#
# No configure vars.
......
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