X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=stepmake%2Faclocal.m4;h=b63198794a9abc035b6b9fb951ade8e0056e43a7;hb=38655bc28e73a0b218ba1582bdb84bab0fdfec4b;hp=b32e9fcc994091bf66e7376a89e2b22060ede498;hpb=0fa4be4e9d80d9870104252d04e49975367f64a3;p=lilypond.git

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index b32e9fcc99..b63198794a 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -6,7 +6,12 @@ dnl StepMake subroutines for configure.in
 
 # Get full path of executable ($1)
 AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [
-    type -p "$1" 2>&1 | awk '{print $NF}'
+    ## which doesn't work in ash, if /usr/bin/which isn't installed
+    ## type -p doesn't work in ash
+    ## command -v doesn't work in zsh
+    ## command -v "$1" 2>&1
+    ## this test should work in ash, bash, pdksh (ksh), zsh
+    type -p "$1" 2>/dev/null | tail -1 | awk '{print $NF}'
 ])
 
 
@@ -70,6 +75,7 @@ AC_DEFUN(STEPMAKE_CHECK_SEARCH_RESULT, [
 AC_DEFUN(STEPMAKE_CHECK_VERSION, [
     r="`eval echo '$'"$1"`"
     AC_MSG_CHECKING("$r version")
+    #exe=`STEPMAKE_GET_EXECUTABLE($r)`
     exe=`STEPMAKE_GET_EXECUTABLE($r)`
     ver=`STEPMAKE_GET_VERSION($exe)`
     num=`STEPMAKE_NUMERIC_VERSION($ver)`
@@ -219,7 +225,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 +236,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}")
 ])