konoha-0.7-autotoolize.patch

Index: build/Makefile.am
===================================================================
--- build/Makefile.am	(revision 640)
+++ build/Makefile.am	(working copy)
@@ -127,7 +127,7 @@
 libkonoha_la_includegen_HEADERS += ../include/konoha/gen/konohac_klr_.h
 libkonoha_la_includegen_HEADERS += ../include/konoha/gen/konohac_stmt_.h
 libkonoha_la_includegen_HEADERS += ../include/konoha/gen/struct_.h
-sampledir = /usr/local/share/konoha/sample
+sampledir = $(datadir)/konoha/sample
 dist_sample_SCRIPTS =
 dist_sample_SCRIPTS += ../dist/sample/ao.k
 dist_sample_SCRIPTS += ../dist/sample/counter.k
@@ -139,18 +139,18 @@
 dist_sample_SCRIPTS += ../dist/sample/main.k
 dist_sample_SCRIPTS += ../dist/sample/readfile.k
 dist_sample_SCRIPTS += ../dist/sample/sort.k
-pkgmathdir = /usr/local/share/konoha/package/math
+pkgmathdir = $(datadir)/konoha/package/math
 dist_pkgmath_DATA =
 dist_pkgmath_DATA += ../dist/package/math/math.k
 dist_pkgmath_DATA += ../dist/package/math/math_linux_32.so
 dist_pkgmath_DATA += ../dist/package/math/math_macosx_32.dylib
 dist_pkgmath_DATA += ../dist/package/math/math_macosx_64.dylib
-pkgposixdir = /usr/local/share/konoha/package/posix
+pkgposixdir = $(datadir)/konoha/package/posix
 dist_pkgposix_DATA =
 dist_pkgposix_DATA += ../dist/package/posix/posix.k
 dist_pkgposix_DATA += ../dist/package/posix/posix_linux_32.so
 dist_pkgposix_DATA += ../dist/package/posix/posix_macosx_32.dylib
-pkgxmldir = /usr/local/share/konoha/package/xml
+pkgxmldir = $(datadir)/konoha/package/xml
 dist_pkgxml_DATA =
 dist_pkgxml_DATA += ../dist/package/xml/libxml2.k
 dist_pkgxml_DATA += ../dist/package/xml/libxml2_linux_32.so
@@ -160,13 +160,13 @@
 dist_pkgxml_DATA += ../dist/package/xml/sample/xmlreader_2.k
 dist_pkgxml_DATA += ../dist/package/xml/src/xml.k
 dist_pkgxml_DATA += ../dist/package/xml/src/xmlreader.k
-pkgdemodir = /usr/local/share/konoha/package/demo
+pkgdemodir = $(datadir)/konoha/package/demo
 dist_pkgdemo_DATA =
 dist_pkgdemo_DATA += ../dist/package/demo/demo.k
 dist_pkgdemo_DATA += ../dist/package/demo/demo_macosx_32.dylib
-scriptklipdir = /usr/local/share/konoha/script/klip
+scriptklipdir = $(datadir)/konoha/script/klip
 dist_scriptklip_SCRIPTS = ../dist/bin/klip.k
-klipdir = /usr/local/bin
+klipdir = $(bindir)
 dist_klip_SCRIPTS = ../dist/bin/klip
 
 
Index: configure.ac
===================================================================
--- configure.ac	(revision 640)
+++ configure.ac	(working copy)
@@ -339,11 +339,11 @@
 # define macros for konoha
 AC_DEFINE_UNQUOTED([ACCONFIG_KONOHA_OS], [${host_os}], Defining KONOHA_OS_MACROS)
 
-AC_MSG_RESULT([this is ${prefix}])
-if  test  "${prefix}" != "NONE" ; then
-  AC_DEFINE_UNQUOTED([KNH_PREFIX], ["${prefix}"], Defineing konoha prefix install folder)
+AC_MSG_RESULT([this is ${datadir}])
+if  test  "${datadir}" != "NONE" ; then
+  AC_DEFINE_UNQUOTED([KNH_PREFIX], ["${datadir}"], Defineing konoha prefix install folder)
 else
-  AC_DEFINE_UNQUOTED([KNH_PREFIX], "$ac_default_prefix", Difining konoha library prefix with default value)
+  AC_DEFINE_UNQUOTED([KNH_PREFIX], "$ac_default_datadir", Difining konoha library prefix with default value)
 fi
 
 AC_DEFINE_UNQUOTED([KONOHA_CONFIG_OS], ["${host_os}"], Konoha os type)