Commit d97f647c authored by Mike Hibler's avatar Mike Hibler

Make it work full vs. clientside configure, absolute vs. relative path.

parent 13f41c18
# #
# Copyright (c) 2000-2016 University of Utah and the Flux Group. # Copyright (c) 2000-2017 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -27,7 +27,8 @@ SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR)) ...@@ -27,7 +27,8 @@ SUBDIR = $(subst $(TESTBED_SRCDIR)/,,$(SRCDIR))
CBINDIR = $(DESTDIR)$(CLIENT_BINDIR) CBINDIR = $(DESTDIR)$(CLIENT_BINDIR)
LBINDIR = $(DESTDIR)/usr/local/bin LBINDIR = $(DESTDIR)/usr/local/bin
IZSRCDIR = $(TESTBED_SRCDIR)/os/imagezip IZSRCDIR = $(SRCDIR)/../imagezip
IZOBJDIR = ../imagezip
# #
# XXX should be in sync with imagezip/GNUmakefile # XXX should be in sync with imagezip/GNUmakefile
...@@ -41,11 +42,11 @@ include $(OBJDIR)/Makeconf ...@@ -41,11 +42,11 @@ include $(OBJDIR)/Makeconf
PARTFLAGS = -I$(IZSRCDIR) PARTFLAGS = -I$(IZSRCDIR)
PARTLIBS = PARTLIBS =
ifeq ($(WITH_MBR),1) ifeq ($(WITH_MBR),1)
PARTLIBS += $(OBJDIR)/os/imagezip/mbr/libmbr.a PARTLIBS += $(IZOBJDIR)/mbr/libmbr.a
PARTFLAGS += -DWITH_MBR PARTFLAGS += -DWITH_MBR
endif endif
ifeq ($(WITH_GPT),1) ifeq ($(WITH_GPT),1)
PARTLIBS += $(OBJDIR)/os/imagezip/gpt/libgpt.a PARTLIBS += $(IZOBJDIR)/gpt/libgpt.a
PARTFLAGS += -DWITH_GPT PARTFLAGS += -DWITH_GPT
endif endif
ifeq ($(WITH_ERASE),1) ifeq ($(WITH_ERASE),1)
...@@ -74,7 +75,7 @@ erase.o: $(IZSRCDIR)/erase.c ...@@ -74,7 +75,7 @@ erase.o: $(IZSRCDIR)/erase.c
$(CC) -c $(CFLAGS) -o erase.o $< $(CC) -c $(CFLAGS) -o erase.o $<
$(PARTLIBS): $(PARTLIBS):
@$(MAKE) -C $(OBJDIR)/os/imagezip partlibs @$(MAKE) -C $(IZOBJDIR) partlibs
install: install:
......
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