From 5920336f6bc213d091644e09e8bc6d5b9c5811b6 Mon Sep 17 00:00:00 2001 From: kpetersn <kmpeters@anl.gov> Date: Mon, 27 Feb 2023 19:24:25 +0000 Subject: [PATCH] Clairified that the 'make' to create the envPaths should be executed in the startup directory. Also switched the git diff output to match the solution. --- 2-IOC-deployment.md | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/2-IOC-deployment.md b/2-IOC-deployment.md index e2f51c2..d002fd3 100644 --- a/2-IOC-deployment.md +++ b/2-IOC-deployment.md @@ -219,21 +219,26 @@ Git can show you the change you made to the file. ```diff $ git diff Makefile diff --git a/iocBoot/iocxxx/Makefile b/iocBoot/iocxxx/Makefile -index fa87a45..4b8cb5c 100644 +index fa87a45..1e2f07a 100644 --- a/iocBoot/iocxxx/Makefile +++ b/iocBoot/iocxxx/Makefile -@@ -7,7 +7,7 @@ include $(TOP)/configure/CONFIG +@@ -7,10 +7,11 @@ include $(TOP)/configure/CONFIG #ARCH = windows-x64 #ARCH = cygwin-x86 #ARCH = linux-x86 -ARCH = linux-x86_64 -+ARCH = rhel8-x86_64 ++#ARCH = linux-x86_64 #ARCH = vxWorks-ppc32 #ARCH = vxWorks694-ppc32 #ARCH = vxWorks-ppc603 ++ARCH = $(EPICS_HOST_ARCH) + + #TARGETS = cdCommands + TARGETS = envPaths + ``` -Once the Makefile is corrected, issue a 'make' to create the envPaths file. +Once the Makefile is corrected, issue a 'make' in the current working directory, `${IOC_DIR}/xxx/iocBoot/iocxxx`, to create the envPaths file. ``` $ make -- GitLab