Commit a87e7f4a authored by Leigh B Stoller's avatar Leigh B Stoller

Move ELABINELAB up into libinstall.pm

parent ef9101c5
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
my $PREFIX = '@prefix@'; my $PREFIX = '@prefix@';
my $SRCDIR = '@srcdir@'; my $SRCDIR = '@srcdir@';
my $ERRORLOG_DBNAME = "@TBERRORLOGDBNAME@"; my $ERRORLOG_DBNAME = "@TBERRORLOGDBNAME@";
my $ELABINELAB = @ELABINELAB@;
my $WINSUPPORT = @WINSUPPORT@; my $WINSUPPORT = @WINSUPPORT@;
my $MAILMANSUPPORT = @MAILMANSUPPORT@; my $MAILMANSUPPORT = @MAILMANSUPPORT@;
my $BUGDBSUPPORT = @BUGDBSUPPORT@; my $BUGDBSUPPORT = @BUGDBSUPPORT@;
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
# #
use POSIX qw(strftime); use POSIX qw(strftime);
use Exporter; use Exporter;
use vars qw(@EXPORT $TOP_OBJDIR $TOP_SRCDIR use vars qw(@EXPORT $TOP_OBJDIR $TOP_SRCDIR $ELABINELAB
$TBROOT $LOGDIR $MAINSITE $PGENISUPPORT $GMAKE $PKG_INFO $TBROOT $LOGDIR $MAINSITE $PGENISUPPORT $GMAKE $PKG_INFO
$PORTSDIR $VARRUN $RCDIR $MYSQL $DBNAME $PORTSDIR $VARRUN $RCDIR $MYSQL $DBNAME
$PROJROOT $PROTOUSER $WAP $PROJROOT $PROTOUSER $WAP
...@@ -18,7 +18,7 @@ use vars qw(@EXPORT $TOP_OBJDIR $TOP_SRCDIR ...@@ -18,7 +18,7 @@ use vars qw(@EXPORT $TOP_OBJDIR $TOP_SRCDIR
$HAVE_XERCES $PROTOGENI_RPCNAME $PROTOGENI_RPCPORT $HAVE_XERCES $PROTOGENI_RPCNAME $PROTOGENI_RPCPORT
$INSTALL_APACHE_CONFIG $APACHE_VERSION $APACHE_START_COMMAND); $INSTALL_APACHE_CONFIG $APACHE_VERSION $APACHE_START_COMMAND);
@EXPORT = qw($TOP_OBJDIR $TOP_SRCDIR @EXPORT = qw($TOP_OBJDIR $TOP_SRCDIR $ELABINELAB
$TBROOT $LOGDIR $MAINSITE $PGENISUPPORT $GMAKE $PKG_INFO $TBROOT $LOGDIR $MAINSITE $PGENISUPPORT $GMAKE $PKG_INFO
$PORTSDIR $VARRUN $RCDIR $MYSQL $DBNAME $PORTSDIR $VARRUN $RCDIR $MYSQL $DBNAME
$PROJROOT $PROTOUSER $WAP $PROJROOT $PROTOUSER $WAP
...@@ -33,6 +33,7 @@ $TOP_SRCDIR = "@top_srcdir@"; ...@@ -33,6 +33,7 @@ $TOP_SRCDIR = "@top_srcdir@";
$LOGDIR = "$TBROOT/log"; $LOGDIR = "$TBROOT/log";
$MAINSITE = @TBMAINSITE@; $MAINSITE = @TBMAINSITE@;
$PGENISUPPORT = @PROTOGENI_SUPPORT@; $PGENISUPPORT = @PROTOGENI_SUPPORT@;
$ELABINELAB = @ELABINELAB@;
$GMAKE = "/usr/local/bin/gmake"; $GMAKE = "/usr/local/bin/gmake";
$PKG_INFO = "/usr/sbin/pkg_info"; $PKG_INFO = "/usr/sbin/pkg_info";
$WAP = "$TBROOT/sbin/withadminprivs"; $WAP = "$TBROOT/sbin/withadminprivs";
......
...@@ -35,7 +35,6 @@ my $USERNODE_IP = '@USERNODE_IP@'; ...@@ -35,7 +35,6 @@ my $USERNODE_IP = '@USERNODE_IP@';
my $FSNODE_IP = '@FSNODE_IP@'; my $FSNODE_IP = '@FSNODE_IP@';
my $LOGFACIL = '@TBLOGFACIL@'; my $LOGFACIL = '@TBLOGFACIL@';
my $TBOPSEMAIL = '@TBOPSEMAIL@'; my $TBOPSEMAIL = '@TBOPSEMAIL@';
my $ELABINELAB = @ELABINELAB@;
my $WINSUPPORT = @WINSUPPORT@; my $WINSUPPORT = @WINSUPPORT@;
my $MAILMANSUPPORT = @MAILMANSUPPORT@; my $MAILMANSUPPORT = @MAILMANSUPPORT@;
my $CVSSUPPORT = @CVSSUPPORT@; my $CVSSUPPORT = @CVSSUPPORT@;
......
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