fix "no modules enabled" check

This commit is contained in:
Chris PeBenito 2006-06-28 13:55:52 +00:00
parent 4a7b2c530d
commit c72f53f639
2 changed files with 2 additions and 8 deletions

View File

@ -135,9 +135,6 @@ $(TMPDIR)/global_bools.conf: $(M4SUPPORT) $(TMPDIR)/generated_definitions.conf $
$(verbose) $(M4) $(M4PARAM) $^ > $@
$(TMPDIR)/all_interfaces.conf: $(M4SUPPORT) $(ALL_INTERFACES)
ifeq ($(ALL_INTERFACES),)
$(error No enabled modules! $(notdir $(MOD_CONF)) may need to be generated by using "make conf")
endif
@test -d $(TMPDIR) || mkdir -p $(TMPDIR)
@echo "ifdef(\`__if_error',\`m4exit(1)')" > $(TMPDIR)/iferror.m4
@echo "divert(-1)" > $@
@ -151,7 +148,7 @@ $(TMPDIR)/rolemap.conf: $(ROLEMAP)
$(TMPDIR)/all_te_files.conf: M4PARAM += -D self_contained_policy
$(TMPDIR)/all_te_files.conf: $(M4SUPPORT) $(TMPDIR)/generated_definitions.conf $(TMPDIR)/all_interfaces.conf $(BASE_TE_FILES) $(TMPDIR)/rolemap.conf
ifeq ($(BASE_TE_FILES),)
ifeq "$(strip $(BASE_TE_FILES))" ""
$(error No enabled modules! $(notdir $(MOD_CONF)) may need to be generated by using "make conf")
endif
@test -d $(TMPDIR) || mkdir -p $(TMPDIR)

View File

@ -115,9 +115,6 @@ $(TMPDIR)/global_bools.conf: $(M4SUPPORT) $(TMPDIR)/generated_definitions.conf $
$(verbose) $(M4) $(M4PARAM) $^ > $@
$(TMPDIR)/all_interfaces.conf: $(M4SUPPORT) $(ALL_INTERFACES)
ifeq ($(ALL_INTERFACES),)
$(error No enabled modules! $(notdir $(MOD_CONF)) may need to be generated by using "make conf")
endif
@test -d $(TMPDIR) || mkdir -p $(TMPDIR)
@echo "ifdef(\`__if_error',\`m4exit(1)')" > $(TMPDIR)/iferror.m4
@echo "divert(-1)" > $@
@ -129,7 +126,7 @@ $(TMPDIR)/rolemap.conf: $(ROLEMAP)
$(call parse-rolemap,base,$@)
$(TMPDIR)/all_te_files.conf: $(M4SUPPORT) $(TMPDIR)/generated_definitions.conf $(TMPDIR)/all_interfaces.conf $(ALL_TE_FILES) $(TMPDIR)/rolemap.conf
ifeq ($(ALL_TE_FILES),)
ifeq "$(strip $(ALL_TE_FILES))" ""
$(error No enabled modules! $(notdir $(MOD_CONF)) may need to be generated by using "make conf")
endif
@test -d $(TMPDIR) || mkdir -p $(TMPDIR)