diff --git a/config/CONFIG_BASE_VERSION b/config/CONFIG_BASE_VERSION index 6edc0dbe4..5495141dd 100644 --- a/config/CONFIG_BASE_VERSION +++ b/config/CONFIG_BASE_VERSION @@ -13,7 +13,10 @@ EPICS_MODIFICATION=2 EPICS_UPDATE_NAME= EPICS_UPDATE_LEVEL=0 -EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}" +EPICS_LOCAL_NAME=B +EPICS_LOCAL_VERSION=0 + +EPICS_VERSION_STRING="EPICS Version ${EPICS_VERSION}.${EPICS_REVISION}.${EPICS_MODIFICATION}.${EPICS_UPDATE_NAME}${EPICS_UPDATE_LEVEL}.$(EPICS_LOCAL_NAME)$(EPICS_LOCAL_VERSION)" CVS_DATE="\$$Date$$" diff --git a/config/CONFIG_SITE.Host.hp700 b/config/CONFIG_SITE.Host.hp700 index 79949e96d..3a00a96e8 100644 --- a/config/CONFIG_SITE.Host.hp700 +++ b/config/CONFIG_SITE.Host.hp700 @@ -8,13 +8,14 @@ SHARED_LIBRARIES=YES # where we expect to find shared libraries if not found elsewhere +# DEFAULT_SHRLIB_SEARCH_PATH = /home/controls/epics/cdev/lib/hpux-10.20:/home/controls/epics/cdev/lib/hpux-10.XX:/opt/TclTk/lib:/opt/xpm/lib/X11:/usr/lib/pa1.1:/usr/lib:/lib:/opt/csr/installed/HP-UX/lib::/opt/OPI/GUI/lib/hp700:/opt/OPI/MapperApplications/lib/hp700:/opt/OPI/cdevAppl/lib/hp700:/opt/OPI/cmlog/lib/hp700:/opt/OPI/models/lib/hp700:/opt/OPI/sddsAppl/lib/hp700 DEFAULT_SHRLIB_SEARCH_PATH = /cs/lib/R$(EPICS_VERSION).$(EPICS_REVISION).$(EPICS_MODIFICATION).$(EPICS_UPDATE_NAME)$(EPICS_UPDATE_LEVEL):$(INSTALL_LIB) #No special action should be required to build or use shared libraries. #However, when a new shared library is built using the above configuration, #it should be copied into the location specified by DEFAULT_SHRLIB_SEARCH_PATH #which in this specific case is: /cs/lib/R3.13.1.1/ - + # cal added this so that libraries can be built with position # independent code even if shared libraries aren't being built ifeq ($(RELOCATABLE), YES)