All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 3bb2c847 authored by Gary Wong's avatar Gary Wong

Add make rules so that geni-get is installed on ProtoGENI clients.

parent 66e3ad64
......@@ -28,7 +28,7 @@ SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
SUBDIRS = lib event tools os sensors tmcc
SUBDIRS = lib event tools os sensors tmcc protogeni
ifeq ($(WITH_EMULAB),1)
all: all-subdirs
......
#
# Copyright (c) 2013 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
# This file is part of the Emulab network testbed software.
#
# This file is free software: you can redistribute it and/or modify it
# under the terms of the GNU Affero General Public License as published by
# the Free Software Foundation, either version 3 of the License, or (at
# your option) any later version.
#
# This file is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
# License for more details.
#
# You should have received a copy of the GNU Affero General Public License
# along with this file. If not, see <http://www.gnu.org/licenses/>.
#
# }}}
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = @top_builddir@
SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
SYSTEM := $(shell uname -s)
# GENI people never decided where geni-get should go, other than to say
# "it's in the user's $PATH". We don't know what users will set their path
# to. But we can reasonably assume that /usr/bin will be in it.
USRBINDIR = $(DESTDIR)/usr/bin
include $(OBJDIR)/Makeconf
all:
include $(TESTBED_SRCDIR)/GNUmakerules
boss-install:
control-install:
fs-install:
client:
client-install: client
ifeq (@PROTOGENI_SUPPORT@,1)
-mkdir -p $(USRBINDIR)
$(INSTALL_PROGRAM) $(SRCDIR)/geni-get $(USRBINDIR)
endif
subboss:
subboss-install:
post-install:
clean:
distclean:
mfs:
mfs-install:
frisbee-mfs:
frisbee-mfs-install:
newnode-mfs:
newnode-mfs-install:
......@@ -6784,7 +6784,8 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/os/imagezip/GNUmakefile \
clientside/os/imagezip/ffs/GNUmakefile \
clientside/os/imagezip/extfs/GNUmakefile \
clientside/os/imagezip/hashmap/GNUmakefile"
clientside/os/imagezip/hashmap/GNUmakefile \
clientside/protogeni/GNUmakefile"
#
# Do this for easy distclean.
......
......@@ -1320,7 +1320,8 @@ outfiles="$outfiles clientside/GNUmakefile clientside/setversion \
clientside/os/imagezip/GNUmakefile \
clientside/os/imagezip/ffs/GNUmakefile \
clientside/os/imagezip/extfs/GNUmakefile \
clientside/os/imagezip/hashmap/GNUmakefile"
clientside/os/imagezip/hashmap/GNUmakefile \
clientside/protogeni/GNUmakefile"
#
# Do this for easy distclean.
......
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