* stepmake/stepmake/help2man-targets.make:

* mf/GNUmakefile:
* tex/GNUmakefile: DESTDIR fixes (Matthias Kilian).

diff --git a/ChangeLog b/ChangeLog
index 4fe7a2ddd19ba85a84484ad5b700ac9b3bb67b13..bd1253561e31a99a202d020b5bcbebab2f9828ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-09  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/stepmake/help2man-targets.make:
+       * mf/GNUmakefile:
+       * tex/GNUmakefile: DESTDIR fixes (Matthias Kilian).
+
 2005-03-07  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * tex/GNUmakefile (latin1.enc): Fix for newer gs generating output

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 98e1f404c12c44a2198b7ee263e5065e3c80733b..afb7b914fd89e753356b9773fe2252c7f6cbe19c 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -215,9 +215,9 @@ $(outdir)/%.enc.in: %.enc
 
 # teTeX-2.0.x compatibility.
 local-install:
-       -$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)/dvips
-       (cd $(DESTDIR)$(local_lilypond_datadir)/dvips && ln -sf ../fonts/map .)
+       -$(INSTALL) -d $(local_lilypond_datadir)/dvips
+       (cd $(local_lilypond_datadir)/dvips && ln -sf ../fonts/map .)
 
 local-uninstall:
-       -rm -f $(DESTDIR)$(local_lilypond_datadir)/dvips/map
-       -rmdir $(DESTDIR)$(local_lilypond_datadir)/dvips
+       -rm -f $(local_lilypond_datadir)/dvips/map
+       -rmdir $(local_lilypond_datadir)/dvips

diff --git a/stepmake/stepmake/help2man-targets.make b/stepmake/stepmake/help2man-targets.make
index c5abd4aee3a3bad990728ff1e483c5fcd830e8a1..a425c7eeee90a385809815cae40a8d49104efd27 100644 (file)
--- a/stepmake/stepmake/help2man-targets.make
+++ b/stepmake/stepmake/help2man-targets.make
@@ -3,9 +3,9 @@ default: man
 local-install: install-help2man
 
 install-help2man: man
-       -$(INSTALL) -d $(DESTDIR)$(mandir)/man1
+       -$(INSTALL) -d $(mandir)/man1
        $(foreach a,  $(HELP2MAN_GROFFS), \
-               $(INSTALL) -m 644 $(a) $(DESTDIR)$(mandir)/man1 && ) true
+               $(INSTALL) -m 644 $(a) $(mandir)/man1 && ) true
 
 man: $(HELP2MAN_GROFFS)
 

diff --git a/tex/GNUmakefile b/tex/GNUmakefile
index 911008f259774680f72a2479ca1df191d2df7162..08156e8b04823e4203f09f777212d155475b32f8 100644 (file)
--- a/tex/GNUmakefile
+++ b/tex/GNUmakefile
@@ -26,12 +26,12 @@ $(outdir)/latin1.enc: GNUmakefile
 
 # teTeX-2.0.x compatibility.
 local-install:
-       -$(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir)/tex
-       (cd $(DESTDIR)$(local_lilypond_datadir)/tex && ln -sf ../fonts/enc .)
+       -$(INSTALL) -d $(local_lilypond_datadir)/tex
+       (cd $(local_lilypond_datadir)/tex && ln -sf ../fonts/enc .)
 
 local-uninstall:
-       -rm -f $(DESTDIR)$(local_lilypond_datadir)/tex/enc
-       -rmdir $(DESTDIR)$(local_lilypond_datadir)/tex
+       -rm -f $(local_lilypond_datadir)/tex/enc
+       -rmdir $(local_lilypond_datadir)/tex
 
 all: $(INSTALLATION_FILES) $(INSTALLATION_OUT_FILES1)