diff --git a/configure/CONFIG_COMMON b/configure/CONFIG_COMMON index 351a77953..8027ccef9 100644 --- a/configure/CONFIG_COMMON +++ b/configure/CONFIG_COMMON @@ -349,6 +349,12 @@ INSTALL_TEMPLATE = $(addprefix $(INSTALL_TEMPLATES_SUBDIR)/, \ $(subst $(CONFIG),top/configure,$(TEMPLATES))) INSTALL_CONFIGS = $(CONFIGS:%= $(INSTALL_CONFIG)/%) +INSTALL_BIN_INSTALLS = $(foreach file, $(BIN_INSTALLS), \ + $(addprefix $(INSTALL_BIN)/,$(notdir $(file)))) + +INSTALL_LIB_INSTALLS = $(foreach file, $(LIB_INSTALLS), \ + $(addprefix $(INSTALL_LIB)/,$(notdir $(file)))) + #--------------------------------------------------------------- # # auto determine the directory paths that things are installed to diff --git a/configure/RULES_BUILD b/configure/RULES_BUILD index d2667b31b..056670d3e 100644 --- a/configure/RULES_BUILD +++ b/configure/RULES_BUILD @@ -142,7 +142,7 @@ rebuild: clean install build : inc build: $(OBJSNAME) $(LIBTARGETS) $(PRODTARGETS) $(TESTPRODNAME) \ - $(TARGETS) $(TESTSCRIPTS) + $(TARGETS) $(TESTSCRIPTS) $(INSTALL_LIB_INSTALLS) inc : $(COMMON_INC) $(INSTALL_INC) $(INSTALL_CONFIGS) @@ -152,15 +152,8 @@ buildInstall : \ $(INSTALL_OBJS) \ $(INSTALL_DOCS) \ $(INSTALL_HTMLS) \ - $(INSTALL_TEMPLATE) - -ifdef BIN_INSTALLS -buildInstall : binInstalls -endif - -ifdef LIB_INSTALLS -buildInstall : libInstalls -endif + $(INSTALL_TEMPLATE) \ + $(INSTALL_BIN_INSTALLS) clean:: @echo "Cleaning" @@ -352,13 +345,23 @@ runtests: $(TESTSCRIPTS_$(BUILD_CLASS)) @$(RM) $@ @echo '($$e=$$0)=~s/.t$$/$(EXE)/;exec "./$$e" or die "exec failed";'>$@ -binInstalls: $(BIN_INSTALLS) - @echo "Installing $(^F)" - @$(INSTALL) -d -m 555 $^ $(INSTALL_BIN) +#--------------------------------------------------------------- +## Install rules for BIN_INSTALLS and LIB_INSTALLS +define BIN_INSTALLS_template +$$(INSTALL_BIN)/$$(notdir $(1)) : $(1) + @echo "Installing $$(