release: 1.1.33

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

diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index aa648c3541583be7b194485c1e0694c8f404c9b3..6351355541333cae375b2a114361048aa97cbe5c 100644 (file)
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -10,40 +10,19 @@ localinstall-files:
        -$(INSTALL) -d $(INSTALLATION_DIR)
        $(foreach i,  $(INSTALLATION_FILES),\
                $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR) &&)true
+       $(foreach suff, $(INSTALLATION_SUFFIXES),  \
+               $(foreach i, $(INSTALLATION_FILES$(suff)), \
+                       $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR$(suff))  && )  && ) true
        $(POST_INSTALL)
-ifneq ($(strip $(INSTALLATION_FILES1)),)
-       $(PRE_INSTALL1)
-       -$(INSTALL) -d $(INSTALLATION_DIR1)
-       $(foreach i,  $(INSTALLATION_FILES1),\
-               $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR1) &&)true
-       $(POST_INSTALL1)
-endif
-ifneq ($(strip $(INSTALLATION_FILES2)),)
-       $(PRE_INSTALL2)
-       -$(INSTALL) -d $(INSTALLATION_DIR2)
-       $(foreach i,  $(INSTALLATION_FILES2),\
-               $(INSTALL) -m 644 $(i) $(INSTALLATION_DIR2) &&)true
-       $(POST_INSTALL2)
-endif
 
 localuninstall: localuninstall-outfiles localuninstall-files 
 
 localuninstall-outfiles:
 
 localuninstall-files:
-       $(foreach i,  $(INSTALLATION_FILES),\
-               rm -f $(INSTALLATION_DIR)/$(i) && ) true
-       -$(foreach i, $(SUBDIRS), rmdir $(INSTALLATION_DIR)/$(i); )
-       -rmdir $(INSTALLATION_DIR)
-ifneq ($(strip $(INSTALLATION_FILES1)),)
-       $(foreach i,  $(INSTALLATION_FILES1),\
-               rm -f $(INSTALLATION_DIR1)/$(i) && ) true
-       -$(foreach i, $(SUBDIRS), rmdir $(INSTALLATION_DIR1)/$(i); )
-       -rmdir $(INSTALLATION_DIR1)
-endif
-ifneq ($(strip $(INSTALLATION_FILES2)),)
-       $(foreach i,  $(INSTALLATION_FILES2),\
-               rm -f $(INSTALLATION_DIR2)/$(i) && ) true
-       -$(foreach i, $(SUBDIRS), rmdir $(INSTALLATION_DIR2)/$(i); )
-       -rmdir $(INSTALLATION_DIR2)
-endif
+       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)))
+