Bring dev/johngourlay/issue-4751 up to date with respect to staging.

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

diff --git a/stepmake/stepmake/omf-targets.make b/stepmake/stepmake/omf-targets.make
index d35dea43e73120abd55a021366a580fa40e931cd..49325215e67afaaa2045a2b8da9d7608aa0910f6 100644 (file)
--- a/stepmake/stepmake/omf-targets.make
+++ b/stepmake/stepmake/omf-targets.make
@@ -1,16 +1,16 @@
 
 omf: $(OMF_FILES)
 
-local-install: omf-local-install
-
 omf-local-install: $(OMF_FILES)
-       -$(INSTALL) -d $(local_package_omfdir)
-       $(foreach a, $(OMF_FILES), $(INSTALL) -m 644 $(a) $(local_package_omfdir)/$(notdir $(a)) && ) true
+       -$(INSTALLPY) -d $(DESTDIR)$(local_package_omfdir)
+       $(foreach a, $(OMF_FILES), $(INSTALLPY) -m 644 $(a) $(DESTDIR)$(local_package_omfdir)/$(notdir $(a)) && ) true
        @echo "Run scrollkeeper-update to register newly installed OMF files."
 
+ifeq ($(out),www)
 local-uninstall: omf-local-uninstall
+endif
 
 omf-local-uninstall:
-       rm -f $(foreach i,  $(OMF_FILES), $(local_package_omfdir)/$(i))
-       -rmdir $(local_package_omfdir)
+       rm -f $(foreach i, $(OMF_FILES), $(DESTDIR)$(local_package_omfdir)/$(notdir $(i)))
+       -rmdir $(DESTDIR)$(local_package_omfdir)