diff --git a/config/CONFIG_COMMON b/config/CONFIG_COMMON index 7b916d5a9..9ca50615e 100644 --- a/config/CONFIG_COMMON +++ b/config/CONFIG_COMMON @@ -30,6 +30,7 @@ INSTALL_MAN = $(INSTALL_LOCATION)/man INSTALL_TEMPLATES = $(INSTALL_LOCATION)/templates INSTALL_DBD = $(INSTALL_LOCATION)/dbd INSTALL_CONFIG = $(INSTALL_LOCATION)/config +INSTALL_JAVA = $(INSTALL_LOCATION)/javalib EPICS_BASE_INCLUDE = $(EPICS_BASE)/include @@ -53,6 +54,7 @@ PERL=perl # install from EPICS INSTALL = $(PERL) $(EPICS_BASE_HOST_BIN)/installEpics.pl INSTALL_PRODUCT = $(INSTALL) +INSTALL_LIBRARY = $(INSTALL) # dbtools from EPICS diff --git a/config/RULES.Host b/config/RULES.Host index 9e6d9b0da..02a6ba8e0 100644 --- a/config/RULES.Host +++ b/config/RULES.Host @@ -429,7 +429,7 @@ PROD_MAKE_COMMAND=$(MAKE) $@\ PRODNAME_RCS_$(ARCH_CLASS)="$($(basename $@)_RCS_$(ARCH_CLASS))"\ PRODNAME_LIBS="$($(basename $@)_LIBS)" -$(PROD): $(PROD_OBJS) $(PROD_RESS) $(PROD_DEPLIBS) $(COND_PROD_DEPLIBS) +$(PROD): $(SRCS) $(COND_PROD_SRCS) $(PROD_RESS) $(PROD_DEPLIBS) $(COND_PROD_DEPLIBS) @$(PROD_MAKE_COMMAND) endif @@ -441,8 +441,6 @@ endif #ifdef PROD # Java classes and packages # -INSTALL_JAVA = $(INSTALL_LOCATION)/javalib - DIRECTORY_TARGETS += $(INSTALL_JAVA) ifdef PACKAGE DIRECTORY_TARGETS += $(INSTALL_JAVA)/$(PACKAGE) @@ -669,14 +667,14 @@ $(INSTALL_BIN)/%: ../% $(INSTALL_LIB)/%.a: %.a @echo "Installing library $@" - @$(INSTALL) -d -m 644 $< $(INSTALL_LIB) + @$(INSTALL_LIBRARY) -d -m 644 $< $(INSTALL_LIB) ifdef RANLIB $(RANLIB) $(RANLIBFLAGS) $@ endif # RANLIB $(INSTALL_LIB)/%.lib: %.lib @echo "Installing library $@" - @$(INSTALL) -d -m 644 $< $(INSTALL_LIB) + @$(INSTALL_LIBRARY) -d -m 644 $< $(INSTALL_LIB) $(INSTALL_SHRLIB)/lib%: lib% @echo "Installing library $@"