* 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 1a3e0505040e4f43fe60c21c0a886a14bce7c437..66c5dddc8f8077b775a89de038ce63d3ee60399e 100644 (file)
--- 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 a4cab0e0aec913413fcd2c60b5346c22d40dc0e1..138947898ff7147372aa26dba6626abe0c3f71e7 100644 (file)
--- 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 bb2a1c72c4d155868381adf40bb806c3da335e35..5ccfb5c1592283fe2f413c8ca61d4955cccc2790 100644 (file)
--- 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)