Commit d6ed8ba6 authored by Leigh Stoller's avatar Leigh Stoller

Temporarily yank ipassgn from FreeBSD 5.X build until it is fixed.

This is fine for the purposes of getting Emulab software base updated.
parent c94d9d86
...@@ -10,10 +10,11 @@ OBJDIR = .. ...@@ -10,10 +10,11 @@ OBJDIR = ..
SUBDIR = tbsetup SUBDIR = tbsetup
UNIFIED = @UNIFIED_BOSS_AND_OPS@ UNIFIED = @UNIFIED_BOSS_AND_OPS@
PLABSUPPORT = @PLABSUPPORT@ PLABSUPPORT = @PLABSUPPORT@
SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
SUBDIRS = checkpass ns2ir nsverify ipassign nseparse checkup SUBDIRS = checkpass ns2ir nsverify nseparse checkup
BIN_STUFF = power snmpit tbend tbprerun tbreport \ BIN_STUFF = power snmpit tbend tbprerun tbreport \
os_load endexp batchexp swapexp \ os_load endexp batchexp swapexp \
...@@ -57,7 +58,15 @@ LIB_STUFF = libtbsetup.pm exitonwarn.pm libtestbed.pm snmpit_intel.pm \ ...@@ -57,7 +58,15 @@ LIB_STUFF = libtbsetup.pm exitonwarn.pm libtestbed.pm snmpit_intel.pm \
snmpit_nortel.pm \ snmpit_nortel.pm \
libaudit.pm libreboot.pm libosload.pm libtestbed.py \ libaudit.pm libreboot.pm libosload.pm libtestbed.py \
libadminmfs.pm libtblog.pm libtblog_simple.pm libArchive.pm \ libadminmfs.pm libtblog.pm libtblog_simple.pm libArchive.pm \
power_mail.pm power_whol.pm power_mail.pm power_whol.pm
ifeq ($(SYSTEM),FreeBSD)
FBSDVERSION := $(shell uname -v | sed -e 's/FreeBSD \([0-9]\).*/FreeBSD\1/')
ifneq ($(FBSDVERSION),FreeBSD5)
SUBDIRS += ipassign
IPASSIGN = Yes
endif
endif
# #
# Force dependencies on the scripts so that they will be rerun through # Force dependencies on the scripts so that they will be rerun through
...@@ -122,7 +131,9 @@ subdir-install: ...@@ -122,7 +131,9 @@ subdir-install:
@$(MAKE) -C nsverify install @$(MAKE) -C nsverify install
@$(MAKE) -C nseparse install @$(MAKE) -C nseparse install
$(PLAB_INSTALL) $(PLAB_INSTALL)
ifeq ($(IPASSIGN),Yes)
@$(MAKE) -C ipassign install @$(MAKE) -C ipassign install
endif
@$(MAKE) -C checkup install @$(MAKE) -C checkup install
script-install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_STUFF)) \ script-install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_STUFF)) \
...@@ -137,7 +148,9 @@ post-install: ...@@ -137,7 +148,9 @@ post-install:
@$(MAKE) -C nsverify post-install @$(MAKE) -C nsverify post-install
@$(MAKE) -C nseparse post-install @$(MAKE) -C nseparse post-install
$(PLAB_POST_INSTALL) $(PLAB_POST_INSTALL)
ifeq ($(IPASSIGN),Yes)
@$(MAKE) -C ipassign post-install @$(MAKE) -C ipassign post-install
endif
chmod 775 $(INSTALL_BINDIR) chmod 775 $(INSTALL_BINDIR)
chmod 775 $(INSTALL_SBINDIR) chmod 775 $(INSTALL_SBINDIR)
chmod 775 $(INSTALL_LIBDIR) chmod 775 $(INSTALL_LIBDIR)
......
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