From: jan <jan>
Date: Tue, 28 May 2002 15:32:01 +0000 (+0000)
Subject: * config.hh.in: Remove duplicate DIR_DATADIR entry.
X-Git-Tag: release/1.5.59~14
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=65260d525659d5228fb8e832bd2c9cfc9ad49526;p=lilypond.git

* config.hh.in: Remove duplicate DIR_DATADIR entry.

* aclocal.m4: Regenerate.

* stepmake/aclocal.m4: Append $FULLVERSION to datadir.
---

diff --git a/ChangeLog b/ChangeLog
index bd99c189df..b690e82d68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-05-28  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* config.hh.in: Remove duplicate DIR_DATADIR entry.
+
+	* aclocal.m4: Regenerate.
+	
+	* stepmake/aclocal.m4: Append $FULLVERSION to datadir.
+
 2002-05-25  Heikki Junes  <heikki.junes@hut.fi>
 
 	* lilypond-mode.el: Write notes with fewer keystrokes trough a 
@@ -16,7 +24,7 @@
 
 2002-05-24  Jan Nieuwenhuizen  <janneke@gnu.org>
 
-d	* lily/text-item.cc (markup_text2molecule): Junk ugly lookahead by
+	* lily/text-item.cc (markup_text2molecule): Junk ugly lookahead by
 	using translate-robust add_molecule instead of add_at_edge.
 	Bugfix for #(lines (finger "" "1")).
 
diff --git a/aclocal.m4 b/aclocal.m4
index e8b82b56e0..ee8b9ea7fd 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -222,7 +222,7 @@ AC_DEFUN(STEPMAKE_CXXTEMPLATE, [
 
 AC_DEFUN(STEPMAKE_DATADIR, [
     if test "$datadir" = "\${prefix}/share"; then
-	    datadir='${prefix}/share/'$package
+	    datadir='${prefix}/share/'$package/$FULL_VERSION
     fi
     DIR_DATADIR=${datadir}
     presome=${prefix}
@@ -233,12 +233,9 @@ AC_DEFUN(STEPMAKE_DATADIR, [
 
     AC_SUBST(datadir)
     AC_SUBST(DIR_DATADIR)
-    
-    dnl yeah, so fuck me gently with a cactus: this doesnt belong here
-    dnl Please take the person responsible for inventing shell-scripts out
-    dnl and shoot him. On behalf of the sane world, thank you.
-    dnl DIR_SHAREDSTATEDIR="foobar"
-    dnl AC_SUBST(DIR_SHAREDSTATEDIR)
+
+    # we used to set DIR_SHAREDSTATEDIR here,
+    but apparently that broke something
     
     AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}")
 ])
diff --git a/config.hh.in b/config.hh.in
index fd68a01406..98dbd72ffb 100644
--- a/config.hh.in
+++ b/config.hh.in
@@ -3,11 +3,9 @@
 /* Hmm */
 #define PACKAGE "@package@"
 
-/* define if bla bla /var and the like. */
+/* we don't set DIR_SHAREDSTATEDIR anymore */
 #define DIR_SHAREDSTATEDIR "@DIR_SHAREDSTATEDIR@"
 
-#define DIR_DATADIR "@DIR_DATADIR@"
-
 /* default lilypond init and input dir */
 #define  DIR_DATADIR "@DIR_DATADIR@"
 
diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index b32e9fcc99..6c7da3b02c 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -219,7 +219,7 @@ AC_DEFUN(STEPMAKE_CXXTEMPLATE, [
 
 AC_DEFUN(STEPMAKE_DATADIR, [
     if test "$datadir" = "\${prefix}/share"; then
-	    datadir='${prefix}/share/'$package
+	    datadir='${prefix}/share/'$package/$FULL_VERSION
     fi
     DIR_DATADIR=${datadir}
     presome=${prefix}
@@ -230,12 +230,9 @@ AC_DEFUN(STEPMAKE_DATADIR, [
 
     AC_SUBST(datadir)
     AC_SUBST(DIR_DATADIR)
-    
-    dnl yeah, so fuck me gently with a cactus: this doesnt belong here
-    dnl Please take the person responsible for inventing shell-scripts out
-    dnl and shoot him. On behalf of the sane world, thank you.
-    dnl DIR_SHAREDSTATEDIR="foobar"
-    dnl AC_SUBST(DIR_SHAREDSTATEDIR)
+
+    # we used to set DIR_SHAREDSTATEDIR here,
+    but apparently that broke something
     
     AC_DEFINE_UNQUOTED(DIR_DATADIR, "${DIR_DATADIR}")
 ])