-# 0: follow LILYPONDPREFIX
-# 1: try source tree
-# 2: try installed tree in $HOME
-# 3: try system installed tree
-#
-make-root=$(wildcard $(LILYPONDPREFIX)/make)
+# 0: try local tree
+# 1: follow LILYPOND_DATADIR
+# 2: try source tree in home
+# 3: try installed tree in $HOME
+# 4: try system installed tree
+# 5: try system installed tree
+#
+make-root=$(wildcard $(depth)/make)
+make-root?=$(wildcard $(LILYPOND_DATADIR)/make)