Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emulab
emulab-devel
Commits
209ff56a
Commit
209ff56a
authored
Feb 28, 2014
by
Leigh B Stoller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes so dev trees get set up properly.
parent
638b7a9a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
GNUmakefile.in
GNUmakefile.in
+1
-1
protogeni/scripts/GNUmakefile.in
protogeni/scripts/GNUmakefile.in
+8
-2
No files found.
GNUmakefile.in
View file @
209ff56a
...
@@ -58,7 +58,7 @@ ifeq ($(ISMAINSITE),1)
...
@@ -58,7 +58,7 @@ ifeq ($(ISMAINSITE),1)
SUBDIRS += tools/rmanage
SUBDIRS += tools/rmanage
endif
endif
ifeq ($(PGENISUPPORT),1)
ifeq ($(PGENISUPPORT),1)
SUBDIRS += protogeni
SUBDIRS += protogeni
apt
endif
endif
else
else
SUBDIRS = db tbsetup account protogeni
SUBDIRS = db tbsetup account protogeni
...
...
protogeni/scripts/GNUmakefile.in
View file @
209ff56a
#
#
# Copyright (c) 2008-201
3
University of Utah and the Flux Group.
# Copyright (c) 2008-201
4
University of Utah and the Flux Group.
#
#
# {{{GENIPUBLIC-LICENSE
# {{{GENIPUBLIC-LICENSE
#
#
...
@@ -32,6 +32,7 @@ TESTBED_SRCDIR = @top_srcdir@
...
@@ -32,6 +32,7 @@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../..
OBJDIR = ../..
SUBDIR = protogeni/scripts
SUBDIR = protogeni/scripts
ISCLEARINGHOUSE = @PROTOGENI_ISCLEARINGHOUSE@
ISCLEARINGHOUSE = @PROTOGENI_ISCLEARINGHOUSE@
PGENISUPPORT = @PROTOGENI_SUPPORT@
include $(OBJDIR)/Makeconf
include $(OBJDIR)/Makeconf
...
@@ -67,15 +68,20 @@ all: $(SBIN_STUFF) $(PSBIN_STUFF) \
...
@@ -67,15 +68,20 @@ all: $(SBIN_STUFF) $(PSBIN_STUFF) \
include $(TESTBED_SRCDIR)/GNUmakerules
include $(TESTBED_SRCDIR)/GNUmakerules
install: $(addprefix $(INSTALL_SBINDIR)/, $(SBIN_STUFF)) \
install: apt-install \
$(addprefix $(INSTALL_SBINDIR)/, $(SBIN_STUFF)) \
$(addprefix $(INSTALL_SBINDIR)/protogeni/, $(PSBIN_STUFF)) \
$(addprefix $(INSTALL_SBINDIR)/protogeni/, $(PSBIN_STUFF)) \
$(INSTALL_LIBEXECDIR)/webquickvm \
$(INSTALL_LIBEXECDIR)/webquickvm \
$(INSTALL_LIBEXECDIR)/webcacontrol \
$(INSTALL_LIBEXECDIR)/webcacontrol \
$(INSTALL_LIBEXECDIR)/webmaptoslice
$(INSTALL_LIBEXECDIR)/webmaptoslice
-rm -f $(INSTALL_SBINDIR)/protogeni/cleanupticket
-rm -f $(INSTALL_SBINDIR)/protogeni/cleanupticket
ifeq ($(PGENISUPPORT),1)
apt-install: $(addprefix $(INSTALL_DIR)/opsdir/cgi-bin/, shellinabox.pl) \
apt-install: $(addprefix $(INSTALL_DIR)/opsdir/cgi-bin/, shellinabox.pl) \
$(addprefix $(INSTALL_SBINDIR)/, aptssh-setup)
$(addprefix $(INSTALL_SBINDIR)/, aptssh-setup)
else
apt-install:
endif
control-install:
control-install:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment