From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 9 Mar 2005 21:45:21 +0000 (+0000)
Subject: * stepmake/stepmake/help2man-targets.make:
X-Git-Tag: release/2.4.6~23
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f19ff3d30c11813b64710cf6414a385d5f03add2;p=lilypond.git

* stepmake/stepmake/help2man-targets.make:
* mf/GNUmakefile:
* tex/GNUmakefile: DESTDIR fixes (Matthias Kilian).
---

diff --git a/ChangeLog b/ChangeLog
index 4fe7a2ddd1..bd1253561e 100644
--- 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 98e1f404c1..afb7b914fd 100644
--- 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 c5abd4aee3..a425c7eeee 100644
--- 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 911008f259..08156e8b04 100644
--- 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)