* 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 bd99c189dfa73781ff9c8f54d3060162d452e868..b690e82d6813cd6c618ccb53e978f751a4c5a9c0 100644 (file)
--- 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 e8b82b56e054d51cf857a036683be4b54960eeb2..ee8b9ea7fd23b00933f920bb64886331cae0b96f 100644 (file)
--- 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 fd68a01406c611406c519b9967b4e2840a6b14e1..98dbd72ffb288977ff5389c02a84c1a57ba1a6a4 100644 (file)
--- 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 b32e9fcc994091bf66e7376a89e2b22060ede498..6c7da3b02c14072f2f452980e1a93d50d83b6b1a 100644 (file)
--- 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}")
 ])