patch::: 1.5.9.jcn3

[lilypond.git] / stepmake / stepmake / install-targets.make

diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index 6351355541333cae375b2a114361048aa97cbe5c..0eaa54f4a06747d834cd7fc0b7b1d8f1d751c40d 100644 (file)
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -1,28 +1,28 @@
-# install-targets.make
 
-localinstall: localinstall-files localinstall-outfiles
+local-install: local-install-files local-install-outfiles
 
-localinstall-outfiles:
+local-install-outfiles:
 
 # urg, parameterise
-localinstall-files:
+local-install-files: $(INSTALLATION_FILES)
        $(PRE_INSTALL)
        -$(INSTALL) -d $(INSTALLATION_DIR)
        $(foreach i,  $(INSTALLATION_FILES),\
-               $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR) &&)true
+               $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR)/ &&)true
        $(foreach suff, $(INSTALLATION_SUFFIXES),  \
+               ($(INSTALL) -d $(INSTALLATION_DIR$(suff)) || true) && \
                $(foreach i, $(INSTALLATION_FILES$(suff)), \
-                       $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR$(suff))  && )  && ) true
+                       $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR$(suff))/  && )  && ) true
        $(POST_INSTALL)
 
-localuninstall: localuninstall-outfiles localuninstall-files 
+local-uninstall: local-uninstall-outfiles local-uninstall-files 
 
-localuninstall-outfiles:
+local-uninstall-outfiles:
 
-localuninstall-files:
+local-uninstall-files:
        rm -f $(foreach i,  $(INSTALLATION_FILES), $(INSTALLATION_DIR)/$(i))
        rm -f $(foreach suff, $(INSTALLATION_SUFFIXES),  \
                $(foreach i, $(INSTALLATION_FILES$(suff)),\
                        $(INSTALLATION_DIR$(suff)/$(i))))
-       rmdir $(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(INSTALLATION_DIR$(suff)))
+       -rmdir $(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(INSTALLATION_DIR$(suff))/)