From 0186661c1d7257979840793a5d2d29e850b2c320 Mon Sep 17 00:00:00 2001 From: aprilnovak Date: Thu, 6 Jun 2024 09:13:29 -0500 Subject: [PATCH] simpilify moose fetch --- Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 8789eb576..0c79d014b 100644 --- a/Makefile +++ b/Makefile @@ -62,14 +62,7 @@ endif CARDINAL_DIR := $(abspath $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST)))) CONTRIB_DIR := $(CARDINAL_DIR)/contrib - -# Use the MOOSE submodule if it exists and MOOSE_DIR is not set -MOOSE_SUBMODULE ?= $(CONTRIB_DIR)/moose -ifneq ($(wildcard $(MOOSE_SUBMODULE)/framework/Makefile),) - MOOSE_DIR ?= $(MOOSE_SUBMODULE) -else - MOOSE_DIR ?= $(shell dirname `pwd`)/moose -endif +MOOSE_DIR ?= $(CONTRIB_DIR)/moose PETSC_DIR ?= $(MOOSE_DIR)/petsc PETSC_ARCH ?= arch-moose