From e0ad502b148e4aac09a8a2e9b978f3d9cd77c656 Mon Sep 17 00:00:00 2001
From: RatkoVasic-NOAA <37597874+RatkoVasic-NOAA@users.noreply.github.com>
Date: Mon, 28 Oct 2019 13:15:19 -0400
Subject: [PATCH] Revert old src/incmake/component_CCPP.mk (#13)

---
 src/incmake/component_CCPP.mk | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/incmake/component_CCPP.mk b/src/incmake/component_CCPP.mk
index 827e2553..00cb6956 100644
--- a/src/incmake/component_CCPP.mk
+++ b/src/incmake/component_CCPP.mk
@@ -3,18 +3,15 @@ ccpp_mk=$(CCPP_BINDIR)/ccpp.mk
 all_component_mk_files+=$(ccpp_mk)
 
 # Location of source code and installation
-CCPP_SRCDIR?=$(ROOTDIR)/FV3/ccpp
-CCPP_BINDIR?=$(ROOTDIR)/FV3/ccpp
-
-# Build directory - set to FV3 (later fv3atm) for old make (i.e. in-source) build
-CCPP_BUILDDIR?=$(ROOTDIR)/FV3
+CCPP_SRCDIR?=$(ROOTDIR)/ccpp
+CCPP_BINDIR?=$(ROOTDIR)/ccpp
 
 # Make sure we have a model that supports CCPP:
 ifeq (,$(findstring FV3,$(COMPONENTS)))
   $(error CCPP requires FV3)
 else
   # Ensure the model is selected.
-  override CCPP_CONFOPT += --config=$(CCPP_SRCDIR)/config/ccpp_prebuild_config.py --builddir=$(CCPP_BUILDDIR)
+  override CCPP_CONFOPT += --config=ccpp/config/ccpp_prebuild_config.py
   override CCPP_MAKEOPT ?= $(FV3_MAKEOPT)
   override CCPP_BUILDOPT ?= $(FV3_BUILDOPT)
 endif
@@ -50,7 +47,7 @@ $(ccpp_mk): configure
 	set -xue                                                        ; \
 	export PATH_CCPP="$(CCPP_SRCDIR)"                               ; \
 	cd $(ROOTDIR)                                                   ; \
-	$$PATH_CCPP/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT)  ; \
+	./ccpp/framework/scripts/ccpp_prebuild.py $(CCPP_CONFOPT)       ; \
 	cd $$PATH_CCPP                                                  ; \
 	./build_ccpp.sh ${BUILD_TARGET} "$$PATH_CCPP" $(ccpp_mk)          \
 	  "$(CCPP_MAKEOPT)" NO NO                                       ; \