Commit fe8b2fd0 authored by Mike Hibler's avatar Mike Hibler

Make double-sure that we don't do install from these directories in a devtree.

They are not in the top level GNUmakefile install, but if someone were to
manually install from their devtree, they would clobber the "master" versions.
This is because of the way that INSTALL_RCDIR and INSTALL_APACHE_CONFIG are
set in Makeconf.in.  They are not prefixed with ${prefix} since they can be
set directly via configure command line "--with" arguments.
parent 42ce0cf0
#
# EMULAB-COPYRIGHT
# Copyright (c) 2002-2007, 2010 University of Utah and the Flux Group.
# Copyright (c) 2002-2010 University of Utah and the Flux Group.
# All rights reserved.
#
#
......@@ -54,6 +54,12 @@ httpd.conf.fixed: httpd.conf
install-dirs:
-mkdir -p $(INSTALL_TOPDIR)/www
#
# Well, this is awkward. Make sure we don't try to install anything from
# a dev tree both because it doesn't make any sense and because it would
# clobber the "real" version.
#
ifeq ($(TBROOT),/usr/testbed)
#
# XXX another woeful hack. There appears to be a well-documented problem
# with Apache and PHP4, where loading PHP with certain extensions will cause
......@@ -78,5 +84,9 @@ install: install-dirs install-scripts httpd.conf.fixed
control-install: install-dirs install-scripts httpd.conf-ops
$(INSTALL_DATA) httpd.conf-ops $(INSTALL_APACHE_CONFIG)/httpd.conf
else
install-scripts install control-install:
@echo "Cannot install Apache config in dev tree"
endif
clean:
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# Copyright (c) 2000-2010 University of Utah and the Flux Group.
# All rights reserved.
#
# For installation.
......@@ -64,6 +64,13 @@ $(INSTALL_RCDIR)/capture: capture.sh
-mkdir -p $(INSTALL_RCDIR)
$(INSTALL_PROGRAM) capture.sh $@
#
# Well, this is awkward. Make sure we don't try to install anything from
# a dev tree both because it doesn't make any sense and because it would
# clobber the "real" version.
#
ifeq ($(TBROOT),/usr/testbed)
install: $(addprefix $(INSTALL_RCDIR)/, $(RC_SCRIPTS))
control-install: $(addprefix $(INSTALL_RCDIR)/, $(OPS_SCRIPTS))
......@@ -74,3 +81,7 @@ clrhouse-install: $(INSTALL_RCDIR)/2.mysql-server.sh \
$(INSTALL_RCDIR)/1.mysql-client.sh
tipserv-install: $(addprefix $(INSTALL_RCDIR)/, $(TIP_SCRIPTS))
else
install control-install subboss-install clrhouse-install tipserv-install:
@echo "Cannot install startup scripts in dev tree"
endif
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