* lily/general-scheme.cc: Compile fixes: include wchar.h, string.h.

* vim/GNUmakefile (local-install): Use $(INSTALL) -d iso mkdir.

* stepmake/stepmake/*.make:
* */GNUmakefile:
* GNUmakefile.in: Prepend $(DESTDIR) to installation directory.

* config.make.in (prefix): Remove broken $(DESTDIR) hack.

16 files changed, 93 insertions, 87 deletions

diff --git a/ChangeLog b/ChangeLog
index b0b0412e2c..d5f69f7e1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2005-02-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* lily/general-scheme.cc: Compile fixes: include wchar.h, string.h.
+
+	Support for DESTDIR besides prefix=/foo
+
+	* vim/GNUmakefile (local-install): Use $(INSTALL) -d iso mkdir.
+
+	* stepmake/stepmake/*.make:
+	* */GNUmakefile:
+	* GNUmakefile.in: Prepend $(DESTDIR) to installation directory.
+
+	* config.make.in (prefix): Remove broken $(DESTDIR) hack.
+
 	* stepmake/aclocal.m4: Use %0.f iso %d to quiet gawk < 3.1.4 and
 	mawk in fontforge (date) test.
 
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 2406980bb5..6144df4615 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -41,7 +41,7 @@ doc:
 	$(MAKE) -C Documentation
 
 install-WWW:
-	-$(INSTALL) -m 755 -d $(webdir) 
+	-$(INSTALL) -m 755 -d $(DESTDIR)$(webdir) 
 	tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz
 # install-WWW does not recurse; fake it visiting Documentation/user manually
 	$(MAKE) -C Documentation/user local-install-WWW
@@ -57,7 +57,7 @@ web-uninstall:
 	$(MAKE) out=www uninstall-WWW=
 
 local-install:
-	$(INSTALL) -d $(local_lilypond_datadir)
+	$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)
 
 final-install:
 	@echo '*** Before using LilyPond, the contents of one of the login scripts'
diff --git a/config.make.in b/config.make.in
index 095b32e240..c7e331d163 100644
--- a/config.make.in
+++ b/config.make.in
@@ -16,7 +16,7 @@ PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 
-prefix = $(DESTDIR)@prefix@
+prefix = @prefix@
 exec_prefix = @exec_prefix@
 
 builddir = @ugh_ugh_autoconf250_builddir@
diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index b9fcf2540c..35b834d225 100644
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -9,9 +9,11 @@
 
 #include "config.hh"
 
-#include <math.h>   /* isinf */
+#include <libintl.h>  /* gettext on MacOS X */
+#include <math.h>  /* isinf */
 #include <stdio.h>
-#include <libintl.h> 		// gettext on macos x
+#include <string.h>  /* memset */
+#include <wchar.h>  /* wcrtomb */
 
 #include "libc-extension.hh"
 #include "lily-guile.hh"
@@ -102,7 +104,6 @@ LY_DEFINE (ly_assoc_get, "ly:assoc-get",
     return default_value;
 }
 
-
 LY_DEFINE (ly_number2string, "ly:number->string",
 	   1, 0, 0, (SCM s),
 	   "Convert @var{num} to a string without generating many decimals.")
@@ -132,9 +133,7 @@ LY_DEFINE (ly_number2string, "ly:number->string",
   return scm_makfrom0str (str);
 }
 
-
-
-LY_DEFINE (ly_version,  "ly:version", 0, 0, 0, (),
+LY_DEFINE (ly_version, "ly:version", 0, 0, 0, (),
 	  "Return the current lilypond version as a list, e.g. @code{(1 3 127 uu1)}. ")
 {
   char const* vs = "\'(" MAJOR_VERSION " " MINOR_VERSION " "  PATCH_LEVEL " " MY_PATCH_LEVEL ")" ;
@@ -142,15 +141,13 @@ LY_DEFINE (ly_version,  "ly:version", 0, 0, 0, (),
   return scm_c_eval_string ((char*)vs);
 }
 
-LY_DEFINE (ly_unit,  "ly:unit", 0, 0, 0, (),
+LY_DEFINE (ly_unit, "ly:unit", 0, 0, 0, (),
 	  "Return the unit used for lengths as a string.")
 {
   return scm_makfrom0str (INTERNAL_UNIT);
 }
 
-
-
-LY_DEFINE (ly_dimension_p,  "ly:dimension?", 1, 0, 0, (SCM d),
+LY_DEFINE (ly_dimension_p, "ly:dimension?", 1, 0, 0, (SCM d),
 	  "Return @var{d} is a number. Used to distinguish length "
 	  "variables from normal numbers.")
 {
@@ -176,9 +173,6 @@ LY_DEFINE (ly_gettext, "ly:gettext",
   return scm_makfrom0str (gettext (scm_i_string_chars (string)));
 }
 
-
-
-
 LY_DEFINE (ly_output_backend, "ly:output-backend",
            0, 0, 0, (),
            "Return name of output backend.")
@@ -186,7 +180,6 @@ LY_DEFINE (ly_output_backend, "ly:output-backend",
   return scm_makfrom0str (output_backend_global.to_str0 ());
 }
 
-
 LY_DEFINE (ly_output_formats, "ly:output-formats",
            0, 0, 0, (),
            "Formats passed to --format as a list of strings, "
@@ -202,13 +195,13 @@ LY_DEFINE (ly_output_formats, "ly:output-formats",
   return lst;
 }
 
-LY_DEFINE(ly_wchar_to_utf_8, "ly:wide-char->utf-8",
-	  1, 0, 0, (SCM wc),
-	  "Encode the Unicode codepoint @var{wc} as UTF-8")
+LY_DEFINE (ly_wchar_to_utf_8, "ly:wide-char->utf-8",
+	   1, 0, 0, (SCM wc),
+	   "Encode the Unicode codepoint @var{wc} as UTF-8")
 {
   char buf[100];
 
-  SCM_ASSERT_TYPE(scm_is_integer (wc), wc, SCM_ARG1, __FUNCTION__, "integer");
+  SCM_ASSERT_TYPE (scm_is_integer (wc), wc, SCM_ARG1, __FUNCTION__, "integer");
   wchar_t wide_char = (wchar_t) scm_to_int (wc);
 
   mbstate_t state;
diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 21956228fe..138c1f03ab 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -10,6 +10,8 @@ export LILYPONDPREFIX:=$(build_lilypond_datadir)
 
 export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH)
 
+export GUILE_LOAD_PATH:=$(builddir):$(GUILE_LOAD_PATH)
+
 ## arg, TEXINPUTS, TFMFONTS, MFINPUTS may still override and thus break this
 export TEXMF:={$(LILYPONDPREFIX),$(shell kpsexpand \$$TEXMF)}
 
@@ -28,8 +30,6 @@ export DVIPSMAKEPK := mktexpk --destdir $(topdir)/mf/out
 endif
 
 
-# guile load path?
-
 the-script-dir=$(wildcard $(script-dir))
 
 
diff --git a/po/GNUmakefile b/po/GNUmakefile
index 0977351160..bd0fcdc099 100644
--- a/po/GNUmakefile
+++ b/po/GNUmakefile
@@ -20,14 +20,14 @@ default: $(MO_FILES)
 
 local-install: $(MO_FILES)
 	for i in $(CATALOGS); do \
-	  $(INSTALL) -d $(localedir)/$$i/LC_MESSAGES; \
+	  $(INSTALL) -d $(DESTDIR)$(localedir)/$$i/LC_MESSAGES; \
 	  $(INSTALL) -m 644 $(outdir)/$$i.mo \
-	  $(localedir)/$$i/LC_MESSAGES/$(package).mo; \
+	  	     $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/$(package).mo; \
 	done
 
 local-uninstall:
 	for i in $(CATALOGS); do \
-	  rm -f $(localedir)/$$i/LC_MESSAGES/$(package).mo; \
-	  rmdir $(localedir)/$$i/LC_MESSAGES || true; \
+	  rm -f $(DESTDIR)$(localedir)/$$i/LC_MESSAGES/$(package).mo; \
+	  rmdir $(DESTDIR)$(localedir)/$$i/LC_MESSAGES || true; \
 	done
 
diff --git a/ps/GNUmakefile b/ps/GNUmakefile
index c57e9e6a12..1e99fd5f7e 100644
--- a/ps/GNUmakefile
+++ b/ps/GNUmakefile
@@ -10,11 +10,11 @@ INSTALLATION_FILES=$(PS_FILES)
 
 # teTeX-3.0 compatibility.
 local-install:
-	-$(INSTALL) -d $(local_lilypond_datadir)/dvips
-	(cd $(local_lilypond_datadir)/dvips && ln -sf ../ps .)
+	-$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)/dvips
+	(cd $(DESTDIR)$(local_lilypond_datadir)/dvips && ln -sf ../ps .)
 
 local-uninstall:
-	-rm -f $(local_lilypond_datadir)/dvips/ps
-	-rmdir $(local_lilypond_datadir)/dvips
+	-rm -f $(DESTDIR)$(local_lilypond_datadir)/dvips/ps
+	-rmdir $(DESTDIR)$(local_lilypond_datadir)/dvips
 
 include $(depth)/make/stepmake.make
diff --git a/stepmake/stepmake/executable-targets.make b/stepmake/stepmake/executable-targets.make
index b16bf89807..0e2c987af4 100644
--- a/stepmake/stepmake/executable-targets.make
+++ b/stepmake/stepmake/executable-targets.make
@@ -7,17 +7,17 @@ local-install: installexe
 local-uninstall: uninstallexe
 
 installexe: all
-	-$(INSTALL) -d $(bindir)
+	-$(INSTALL) -d $(DESTDIR)$(bindir)
 	$(foreach a, $(EXECUTABLES), \
 		$(INSTALL) -m 755 $(outdir)/$(a) \
-		$(bindir)/$(program_prefix)$(a)$(program_suffix) && \
+		$(DESTDIR)$(bindir)/$(program_prefix)$(a)$(program_suffix) && \
 		strip $(bindir)/$(program_prefix)$(a)$(program_suffix) && ) true
 	$(foreach a, $(SEXECUTABLES), \
-		$(INSTALL) -m 755 $(outdir)/$(a) $(bindir) &&) true
+		$(INSTALL) -m 755 $(outdir)/$(a) $(DESTDIR)$(bindir) &&) true
 
 uninstallexe:
 	$(foreach a, $(EXECUTABLES), rm -f \
-		$(bindir)/$(program_prefix)$(a)$(program_suffix) && ) true
-	$(foreach a, $(SEXECUTABLES), rm -f $(bindir)/$(a) &&) true
+		$(DESTDIR)$(bindir)/$(program_prefix)$(a)$(program_suffix) && ) true
+	$(foreach a, $(SEXECUTABLES), rm -f $(DESTDIR)$(bindir)/$(a) &&) true
 
 
diff --git a/stepmake/stepmake/generic-targets.make b/stepmake/stepmake/generic-targets.make
index 22cfdc3500..272fa15392 100644
--- a/stepmake/stepmake/generic-targets.make
+++ b/stepmake/stepmake/generic-targets.make
@@ -135,7 +135,7 @@ uninstall: local-uninstall
 local-uninstall:
 
 installextradoc:
-	-$(INSTALL) -d $(prefix)/doc/$(package)
+	-$(INSTALL) -d $(DESTDIR)$(prefix)/doc/$(package)
 	$(foreach i, $(EXTRA_DOC_FILES),\
 		cp -r $(i) $(prefix)/doc/$(package) &&) true
 
diff --git a/stepmake/stepmake/help2man-targets.make b/stepmake/stepmake/help2man-targets.make
index c5abd4aee3..04dada703c 100644
--- a/stepmake/stepmake/help2man-targets.make
+++ b/stepmake/stepmake/help2man-targets.make
@@ -4,7 +4,7 @@ local-install: install-help2man
 
 install-help2man: man
 	-$(INSTALL) -d $(DESTDIR)$(mandir)/man1
-	$(foreach a,  $(HELP2MAN_GROFFS), \
+	$(foreach a, $(HELP2MAN_GROFFS), \
 		$(INSTALL) -m 644 $(a) $(DESTDIR)$(mandir)/man1 && ) true
 
 man: $(HELP2MAN_GROFFS)
@@ -13,6 +13,7 @@ local-uninstall: uninstall-help2man
 
 uninstall-help2man:
 	$(foreach a, $(notdir $(MANGROFFS)), rm -f $(a) && ) true
+	-rmdir $(DESTDIR)$(mandir)/man1
 
 
 
diff --git a/stepmake/stepmake/install-library-targets.make b/stepmake/stepmake/install-library-targets.make
index 3d657c5073..fac40229f7 100644
--- a/stepmake/stepmake/install-library-targets.make
+++ b/stepmake/stepmake/install-library-targets.make
@@ -1,22 +1,22 @@
 
 local-install: $(LIBRARY)
 ifneq ($(strip $(INSTALL_HEADERS)),)
-	$(INSTALL) -d $(includedir)
-	$(INSTALL) $(INSTALL_HEADERS) $(includedir)
+	$(INSTALL) -d $(DESTDIR)$(includedir)
+	$(INSTALL) $(INSTALL_HEADERS) $(DESTDIR)$(includedir)
 endif
 ifeq ($(LIB_SUFFIX),.so)
-	$(INSTALL) -d $(libdir)
-	$(INSTALL) $(LIBRARY) $(libdir)/$(INSTALL_LIBRARY).$(VERSION)
-	ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX).$(MAJOR_VERSION)
-	ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX)
+	$(INSTALL) -d $(DESTDIR)$(libdir)
+	$(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(INSTALL_LIBRARY).$(VERSION)
+	ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(DESTDIR)$(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX).$(MAJOR_VERSION)
+	ln -s $(LIB_PREFIX)intl$(LIB_SUFFIX).$(VERSION) $(DESTDIR)$(libdir)/$(LIB_PREFIX)intl$(LIB_SUFFIX)
 else
-	$(INSTALL) -d $(libdir)
-	$(INSTALL) $(LIBRARY) $(libdir)/$(INSTALL_LIBRARY)
+	$(INSTALL) -d $(DESTDIR)$(libdir)
+	$(INSTALL) $(LIBRARY) $(DESTDIR)$(libdir)/$(INSTALL_LIBRARY)
 endif
 
 local-uninstall:
 ifneq ($(strip $(INSTALL_HEADERS)),)
-	rm -f $(addprefix $(includedir)/, $(INSTALL_HEADERS))
+	rm -f $(addprefix $(DESTDIR)$(includedir)/, $(INSTALL_HEADERS))
 endif
-	rm -f $(libdir)/$(INSTALL_LIBRARY)
+	rm -f $(DESTDIR)$(libdir)/$(INSTALL_LIBRARY)
 
diff --git a/stepmake/stepmake/install-out-targets.make b/stepmake/stepmake/install-out-targets.make
index 3abb38417b..2cbe3ebd92 100644
--- a/stepmake/stepmake/install-out-targets.make
+++ b/stepmake/stepmake/install-out-targets.make
@@ -5,13 +5,13 @@ local-install-files:
 
 # urg, parameterise
 local-install-outfiles: $(INSTALLATION_OUT_FILES) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(INSTALLATION_OUT_FILES$(suff)))
-	-$(INSTALL) -d $(INSTALLATION_OUT_DIR)
+	-$(INSTALL) -d $(DESTDIR)$(INSTALLATION_OUT_DIR)
 	$(foreach i, $(INSTALLATION_OUT_FILES), \
-		$(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR)/ && ) true
+		$(INSTALL) -m 644 $(i) $(DESTDIR)$(INSTALLATION_OUT_DIR)/ && ) true
 	$(foreach suff, $(INSTALLATION_OUT_SUFFIXES),  \
-		($(INSTALL) -d $(INSTALLATION_OUT_DIR$(suff))/ || true) && \
+		($(INSTALL) -d $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/ || true) && \
 		$(foreach i, $(INSTALLATION_OUT_FILES$(suff)), \
-			$(INSTALL) -m 644 $(i) $(INSTALLATION_OUT_DIR$(suff))/ && ) true && ) true
+			$(INSTALL) -m 644 $(i) $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/ && ) true && ) true
 
 
 local-uninstall: local-uninstall-outfiles local-uninstall-files 
@@ -20,8 +20,8 @@ local-uninstall-files:
 
 local-uninstall-outfiles:
 	rm -f $(foreach  i, $(notdir $(INSTALLATION_OUT_FILES)), \
-		$(INSTALLATION_OUT_DIR)/$(i))
+		$(DESTDIR)$(INSTALLATION_OUT_DIR)/$(i))
 	rm -f $(foreach suff, $(INSTALLATION_OUT_SUFFIXES),  \
 		$(foreach i, $(INSTALLATION_OUT_FILES$(suff)), \
-			$(INSTALLATION_OUT_DIR$(suff))/$(i)))
-	-rmdir $(INSTALLATION_OUT_DIR) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(INSTALLATION_OUT_DIR$(suff)))
+			$(DESTDIR)$(INSTALLATION_OUT_DIR$(suff))/$(i)))
+	-rmdir $(DESTDIR)$(INSTALLATION_OUT_DIR) $(foreach suff, $(INSTALLATION_OUT_SUFFIXES), $(DESTDIR)$(INSTALLATION_OUT_DIR$(suff)))
diff --git a/stepmake/stepmake/install-targets.make b/stepmake/stepmake/install-targets.make
index 762a509b4e..8fe3c6d0c6 100644
--- a/stepmake/stepmake/install-targets.make
+++ b/stepmake/stepmake/install-targets.make
@@ -6,13 +6,13 @@ local-install-outfiles:
 # urg, parameterise
 local-install-files: $(INSTALLATION_FILES)
 	$(PRE_INSTALL)
-	-$(INSTALL) -d $(INSTALLATION_DIR)
+	-$(INSTALL) -d $(DESTDIR)$(INSTALLATION_DIR)
 	for i in $(INSTALLATION_FILES); do \
-		$(INSTALL) -m 644 $$i $(INSTALLATION_DIR)/ ; done
+		$(INSTALL) -m 644 $$i $(DESTDIR)$(INSTALLATION_DIR)/ ; done
 	$(foreach suff, $(INSTALLATION_SUFFIXES),  \
-		($(INSTALL) -d $(INSTALLATION_DIR$(suff)) || true) && \
+		($(INSTALL) -d $(DESTDIR)$(INSTALLATION_DIR$(suff)) || true) && \
 		for i in $(INSTALLATION_FILES$(suff)); do \
-			$(INSTALL) -m 644 $$i $(INSTALLATION_DIR$(suff))/; done )
+			$(INSTALL) -m 644 $$i $(DESTDIR)$(INSTALLATION_DIR$(suff))/; done )
 	$(POST_INSTALL)
 
 local-uninstall: local-uninstall-outfiles local-uninstall-files 
@@ -20,9 +20,9 @@ local-uninstall: local-uninstall-outfiles local-uninstall-files
 local-uninstall-outfiles:
 
 local-uninstall-files:
-	rm -f $(foreach i,  $(INSTALLATION_FILES), $(INSTALLATION_DIR)/$(i))
+	rm -f $(foreach i,  $(INSTALLATION_FILES), $(DESTDIR)$(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))/)
+			$(DESTDIR)$(INSTALLATION_DIR$(suff)/$(i))))
+	-rmdir $(DESTDIR)$(INSTALLATION_DIR) $(foreach suff, $(INSTALLATION_SUFFIXES), $(DESTDIR)$(INSTALLATION_DIR$(suff))/)
 
diff --git a/stepmake/stepmake/omf-targets.make b/stepmake/stepmake/omf-targets.make
index d35dea43e7..eea2b7047b 100644
--- a/stepmake/stepmake/omf-targets.make
+++ b/stepmake/stepmake/omf-targets.make
@@ -4,13 +4,13 @@ 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
+	-$(INSTALL) -d $(DESTDIR)$(local_package_omfdir)
+	$(foreach a, $(OMF_FILES), $(INSTALL) -m 644 $(a) $(DESTDIR)$(local_package_omfdir)/$(notdir $(a)) && ) true
 	@echo "Run scrollkeeper-update to register newly installed OMF files."
 
 local-uninstall: omf-local-uninstall
 
 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)/$(i))
+	-rmdir $(DESTDIR)$(local_package_omfdir)
 
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index b615e06079..ef46fa53f9 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -18,6 +18,6 @@ MAKEINFO = LANG= $(MAKEINFO_PROGRAM)  --enable-encoding
 INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES)))
 INFO_INSTALL_COMMAND =$(if $(INFO_INSTALL_FILES),\
 	$(INSTALL) -d $(DESTDIR)$(package_infodir) ; \
-	$(MAKE) INSTALLATION_OUT_DIR=$(DESTDIR)$(package_infodir) \
+	$(MAKE) INSTALLATION_OUT_DIR=$(package_infodir) \
 		depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" \
 		-f $(stepdir)/install-out.sub.make,true)
diff --git a/vim/GNUmakefile b/vim/GNUmakefile
index e5f12f14f1..33402fc846 100644
--- a/vim/GNUmakefile
+++ b/vim/GNUmakefile
@@ -19,36 +19,36 @@ STEPMAKE_TEMPLATES=install-out
 include $(depth)/make/stepmake.make 
 
 local-install:
-	mkdir -p $(vimdir)/compiler
-	$(INSTALL) -m 644 lilypond-compiler.vim $(vimdir)/compiler/lilypond.vim
+	-$(INSTALL) -d $(DESTDIR)$(vimdir)/compiler
+	$(INSTALL) -m 644 lilypond-compiler.vim $(DESTDIR)$(vimdir)/compiler/lilypond.vim
 
-	mkdir -p $(vimdir)/ftdetect
-	$(INSTALL) -m 644 lilypond-ftdetect.vim $(vimdir)/ftdetect/lilypond.vim
+	-$(INSTALL) -d $(DESTDIR)$(vimdir)/ftdetect
+	$(INSTALL) -m 644 lilypond-ftdetect.vim $(DESTDIR)$(vimdir)/ftdetect/lilypond.vim
 
-	mkdir -p $(vimdir)/ftplugin
-	$(INSTALL) -m 644 lilypond-ftplugin.vim $(vimdir)/ftplugin/lilypond.vim
+	-$(INSTALL) -d $(DESTDIR)$(vimdir)/ftplugin
+	$(INSTALL) -m 644 lilypond-ftplugin.vim $(DESTDIR)$(vimdir)/ftplugin/lilypond.vim
 
-	mkdir -p $(vimdir)/indent
-	$(INSTALL) -m 644 lilypond-indent.vim $(vimdir)/indent/lilypond.vim
+	-$(INSTALL) -d $(DESTDIR)$(vimdir)/indent
+	$(INSTALL) -m 644 lilypond-indent.vim $(DESTDIR)$(vimdir)/indent/lilypond.vim
 
-	mkdir -p $(vimdir)/syntax
-	$(INSTALL) -m 644 lilypond-syntax.vim $(vimdir)/syntax/lilypond.vim
+	-$(INSTALL) -d $(DESTDIR)$(vimdir)/syntax
+	$(INSTALL) -m 644 lilypond-syntax.vim $(DESTDIR)$(vimdir)/syntax/lilypond.vim
 
 local-uninstall:
-	rm $(vimdir)/compiler/lilypond.vim
-	-rmdir -p $(vimdir)/compiler 
+	rm $(DESTDIR)$(vimdir)/compiler/lilypond.vim
+	-rmdir -p $(DESTDIR)$(vimdir)/compiler 
 
-	rm $(vimdir)/ftdetect/lilypond.vim
-	-rmdir -p $(vimdir)/ftdetect 
+	rm $(DESTDIR)$(vimdir)/ftdetect/lilypond.vim
+	-rmdir -p $(DESTDIR)$(vimdir)/ftdetect 
 
-	rm $(vimdir)/ftplugin/lilypond.vim
-	-rmdir -p $(vimdir)/ftplugin 
+	rm $(DESTDIR)$(vimdir)/ftplugin/lilypond.vim
+	-rmdir -p $(DESTDIR)$(vimdir)/ftplugin 
 
-	rm $(vimdir)/indent/lilypond.vim
-	-rmdir -p $(vimdir)/indent 
+	rm $(DESTDIR)$(vimdir)/indent/lilypond.vim
+	-rmdir -p $(DESTDIR)$(vimdir)/indent 
 
-	rm $(vimdir)/syntax/lilypond.vim
-	-rmdir -p $(vimdir)/syntax
+	rm $(DESTDIR)$(vimdir)/syntax/lilypond.vim
+	-rmdir -p $(DESTDIR)$(vimdir)/syntax
 
 $(LILYPOND_WORDS): 
 	cd $(topdir) && $(PYTHON) buildscripts/lilypond-words.py --words --vim --dir=$(builddir)/vim/$(outconfbase)