X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=stepmake%2Fstepmake%2Finstall-targets.make;h=1344a2f52407801724be203f9195c7647be8a210;hb=aaeb514ff33939b635e30453691c03c0c55ec499;hp=aa648c3541583be7b194485c1e0694c8f404c9b3;hpb=9efbad2d9487a05b04423e7e9f062968e8f8eaf4;p=lilypond.git

diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index aa648c3541..1344a2f524 100644
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -1,49 +1,26 @@
-# 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
+	-$(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_DIR)
+	$(INSTALLPY) -m 644 $(addprefix $(src-dir)/,$(INSTALLATION_FILES)) $(DESTDIR)$(INSTALLATION_DIR)/
+	$(foreach suff, $(INSTALLATION_SUFFIXES),  \
+		($(INSTALLPY) -d $(DESTDIR)$(INSTALLATION_DIR$(suff)) || true) && \
+		$(INSTALLPY) -m 644  $(addprefix $(src-dir), $(INSTALLATION_FILES$(suff))) $(DESTDIR)$(INSTALLATION_DIR$(suff))/ )
 	$(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 
+local-uninstall: local-uninstall-outfiles local-uninstall-files
 
-localuninstall-outfiles:
+local-uninstall-outfiles:
+
+local-uninstall-files:
+	rm -f $(foreach i,  $(INSTALLATION_FILES), $(DESTDIR)$(INSTALLATION_DIR)/$(i))
+	rm -f $(foreach suff, $(INSTALLATION_SUFFIXES),  \
+		$(foreach i, $(INSTALLATION_FILES$(suff)),\
+			$(DESTDIR)$(INSTALLATION_DIR$(suff)/$(i))))
+	-rmdir -p $(DESTDIR)$(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(DESTDIR)$(INSTALLATION_DIR$(suff))/)
 
-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