Skip to content
Snippets Groups Projects
Commit d7cf410d authored by Jeong Han Lee's avatar Jeong Han Lee
Browse files

remove R_base_VERSION in module path

parent 34c293d9
No related branches found
No related tags found
No related merge requests found
...@@ -64,12 +64,14 @@ MAKEHOME:=$(dir $(lastword ${MAKEFILE_LIST})) ...@@ -64,12 +64,14 @@ MAKEHOME:=$(dir $(lastword ${MAKEFILE_LIST}))
# Get the name of the Makefile that included this file. # Get the name of the Makefile that included this file.
USERMAKEFILE:=$(lastword $(filter-out $(lastword ${MAKEFILE_LIST}), ${MAKEFILE_LIST})) USERMAKEFILE:=$(lastword $(filter-out $(lastword ${MAKEFILE_LIST}), ${MAKEFILE_LIST}))
# Some configuration:
DEFAULT_EPICS_VERSIONS = 3.13.9 3.13.10 3.14.8 3.14.12
BUILDCLASSES = vxWorks DEFAULT_EPICS_VERSIONS =
EPICS_MODULES ?= /ioc/modules BUILDCLASSES =
EPICS_MODULES =
EPICS_LOCATION =
MODULE_LOCATION = ${EPICS_MODULES}/$(or ${PRJ},$(error PRJ not defined))/$(or ${LIBVERSION},$(error LIBVERSION not defined)) MODULE_LOCATION = ${EPICS_MODULES}/$(or ${PRJ},$(error PRJ not defined))/$(or ${LIBVERSION},$(error LIBVERSION not defined))
EPICS_LOCATION = /usr/local/epics
DOCUEXT = txt html htm doc pdf ps tex dvi gif jpg png DOCUEXT = txt html htm doc pdf ps tex dvi gif jpg png
DOCUEXT += TXT HTML HTM DOC PDF PS TEX DVI GIF JPG PNG DOCUEXT += TXT HTML HTM DOC PDF PS TEX DVI GIF JPG PNG
...@@ -162,14 +164,14 @@ MKDIR = mkdir -p -m 775 ...@@ -162,14 +164,14 @@ MKDIR = mkdir -p -m 775
clean:: clean::
$(RMDIR) O.* $(RMDIR) O.*
clean.%:: #clean.%::
$(RMDIR) $(wildcard O.*${@:clean.%=%}*) # $(RMDIR) $(wildcard O.*${@:clean.%=%}*)
uninstall: uninstall:
$(RMDIR) ${MODULE_LOCATION} $(RMDIR) ${MODULE_LOCATION}
uninstall.%: #uninstall.%:
$(RMDIR) $(wildcard ${MODULE_LOCATION}/R*${@:uninstall.%=%}*) # $(RMDIR) $(wildcard ${MODULE_LOCATION}/R*${@:uninstall.%=%}*)
help: help:
@echo "usage:" @echo "usage:"
...@@ -457,13 +459,13 @@ O.%: ...@@ -457,13 +459,13 @@ O.%:
ifeq ($(shell echo "${LIBVERSION}" | grep -v -E "^[0-9]+\.[0-9]+\.[0-9]+\$$"),) ifeq ($(shell echo "${LIBVERSION}" | grep -v -E "^[0-9]+\.[0-9]+\.[0-9]+\$$"),)
install:: build install:: build
@test ! -d ${MODULE_LOCATION}/R${EPICSVERSION}/lib/${T_A} || \ @test ! -d ${MODULE_LOCATION}/lib/${T_A} || \
(echo -e "Error: ${MODULE_LOCATION}/R${EPICSVERSION}/lib/${T_A} already exists.\nNote: If you really want to overwrite then uninstall first."; false) (echo -e "Error: ${MODULE_LOCATION}/lib/${T_A} already exists.\nNote: If you really want to overwrite then uninstall first."; false)
else else
install:: build install:: build
@test ! -d ${MODULE_LOCATION}/R${EPICSVERSION}/lib/${T_A} || \ @test ! -d ${MODULE_LOCATION}/lib/${T_A} || \
(echo -e "Warning: Re-installing ${MODULE_LOCATION}/R${EPICSVERSION}/lib/${T_A}"; \ (echo -e "Warning: Re-installing ${MODULE_LOCATION}/lib/${T_A}"; \
$(RMDIR) ${MODULE_LOCATION}/R${EPICSVERSION}/lib/${T_A}) $(RMDIR) ${MODULE_LOCATION}/lib/${T_A})
endif endif
install build debug:: O.${EPICSVERSION}_Common O.${EPICSVERSION}_${T_A} install build debug:: O.${EPICSVERSION}_Common O.${EPICSVERSION}_${T_A}
...@@ -544,7 +546,7 @@ BUILDRULE=build: ...@@ -544,7 +546,7 @@ BUILDRULE=build:
BASERULES=${EPICS_BASE}/configure/RULES BASERULES=${EPICS_BASE}/configure/RULES
endif # 3.14 endif # 3.14
INSTALL_REV = ${MODULE_LOCATION}/R${EPICSVERSION} INSTALL_REV = ${MODULE_LOCATION}
INSTALL_BIN = ${INSTALL_REV}/bin/$(T_A) INSTALL_BIN = ${INSTALL_REV}/bin/$(T_A)
INSTALL_LIB = ${INSTALL_REV}/lib/$(T_A) INSTALL_LIB = ${INSTALL_REV}/lib/$(T_A)
INSTALL_INCLUDE = ${INSTALL_REV}/include INSTALL_INCLUDE = ${INSTALL_REV}/include
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment