From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 13 Jun 2002 13:25:47 +0000 (+0000)
Subject: * stepmake/GNUmakefile.in: Don't install stepmake.  This breaks
X-Git-Tag: release/1.5.61~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d62ff17b1afcdf7396d17a23a4623ea1251eba32;p=lilypond.git

* stepmake/GNUmakefile.in: Don't install stepmake.  This breaks
the use of make/ly.make for use as an external makefile.  Probably
noone except for myself ever used this anyway.

* stepmake/stepmake/GNUmakefile (INSTALLATION_DIR): Bugfix: Adapt
to new $datadir convention (<package>/<version>).
---

diff --git a/ChangeLog b/ChangeLog
index 1a3e050504..66c5dddc8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-13  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* stepmake/GNUmakefile.in: Don't install stepmake.  This breaks
+	the use of make/ly.make for use as an external makefile.  Probably
+	noone except for myself ever used this anyway.
+
+	* stepmake/stepmake/GNUmakefile (INSTALLATION_DIR): Bugfix: Adapt
+	to new $datadir convention (<package>/<version>).
+
 2002-06-13  Han-Wen  <hanwen@cs.uu.nl>
 
 	* lily/key-engraver.cc (try_music): read request only once. Don't
diff --git a/stepmake/GNUmakefile.in b/stepmake/GNUmakefile.in
index a4cab0e0ae..138947898f 100644
--- a/stepmake/GNUmakefile.in
+++ b/stepmake/GNUmakefile.in
@@ -38,7 +38,8 @@ include $(depth)/make/stepmake.make
 ifeq ($(PACKAGE),STEPMAKE)
 SUBDIRS = bin make stepmake 
 else
-SUBDIRS = stepmake
+## Use this if you want to install stepmake
+##SUBDIRS = stepmake
 endif
 #
 
diff --git a/stepmake/stepmake/GNUmakefile b/stepmake/stepmake/GNUmakefile
index bb2a1c72c4..5ccfb5c159 100644
--- a/stepmake/stepmake/GNUmakefile
+++ b/stepmake/stepmake/GNUmakefile
@@ -19,7 +19,7 @@ STEPMAKE_TEMPLATES=makedir install
 ifeq ($(PACKAGE),STEPMAKE)
 INSTALLATION_DIR=$(datadir)/stepmake
 else
-INSTALLATION_DIR=$(dir $(datadir))/$(package)/stepmake/stepmake
+INSTALLATION_DIR=$(dir $(patsubst %/, %, $(dir $(datadir))))$(package)/stepmake/stepmake
 endif
 INSTALLATION_FILES=GNUmakefile $(MAKE_FILES)