Skip to content

Commit

Permalink
Fix standalone build installation
Browse files Browse the repository at this point in the history
- Update lib install location for standalone build
- Add comment on adding MOTOR_ZABER_MOTION path to RELEASE.local
  • Loading branch information
colbysparks committed Nov 15, 2024
1 parent d38d4cb commit 5a4b45a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion configure/RELEASE
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
# RELEASE - Location of external support modules

# Note that if building as standalone module, MOTOR_ZABER_MOTION must be defined in RELEASE.local
MOTOR_ZABER_MOTION = $(MOTOR)/modules/motorZaberMotion

# Use motor/module's generated release file when buidling inside motor
-include $(TOP)/../RELEASE.$(EPICS_HOST_ARCH).local
# Use motorZaberMotion's RELEASE.local when building outside motor
-include $(TOP)/configure/RELEASE.local

2 changes: 1 addition & 1 deletion zaberMotionSupport/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ifndef ZML_HOST_ARCH
$(error "motorZaberMotion: Unsupported architecture: $(EPICS_HOST_ARCH)")
endif

LIB_INSTALLS += $(wildcard ZaberMotionCppSupport/lib/$(ZML_HOST_ARCH)/*)
LIB_INSTALLS += $(wildcard ../ZaberMotionCppSupport/lib/$(ZML_HOST_ARCH)/*)

#=============================

Expand Down

0 comments on commit 5a4b45a

Please sign in to comment.