--- Makefile.am.orig	Mon Aug  6 16:59:49 2007
+++ Makefile.am	Mon Aug  6 17:07:45 2007
@@ -9,7 +9,8 @@
 
 SUBDIRS  = asm builtin engine fft include io lib parse ${PLOTDIR}
 
-asirdir       = ${libdir}/asir
+bindir        = ${prefix}/bin
+asirdir       = ${bindir}
 asir_PROGRAMS = asir
 asir_SOURCES  = parse/main.c
 asir_LDADD    = libasir.a libasir-gc.a
@@ -17,7 +18,7 @@
 
 GC            = gc6.8
 GC_TAR_GZ     = ${GC}.tar.gz
-GC_PATCH      = gc6.5-risa.diff
+GC_PATCH      = gc6.8-risa.diff
 GC_DISTDIR    = @GC_DISTDIR@
 GC_MASTER_SITE=ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/
 OX_FETCH      = ${bindir}/oxfetch.sh
@@ -104,33 +105,33 @@
 	${INSTALL_DATA} libasir-gc.a ${DESTDIR}${libdir}/libasir-gc.a
 
 install-openxm: asir${EXEEXT} install-libasir install-libasir-gc
-	-mkdir -p ${DESTDIR}${bindir}
-	${INSTALL_PROGRAM} asir ${DESTDIR}${bindir}
-	-mkdir -p ${DESTDIR}${asirdir}
-	(cd ${top_srcdir}/lib; ${MAKE} install-doc install-lib)
-	-rm -f ${DESTDIR}${bindir}/ox_asir${EXEEXT}
-	(cd ${DESTDIR}${bindir} ; ${LN_S} asir${EXEEXT} ox_asir${EXEEXT})
-	-(cd ${DESTDIR}${asirdir}; \
-    rm -f asir${EXEEXT} ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT})
-	(cd ${DESTDIR}${asirdir} ; \
-	${LN_S} ../../bin/asir${EXEEXT} asir${EXEEXT} ; \
-	${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \
-	${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \
-	${LN_S} asir${EXEEXT} ox_plot${EXEEXT})
-	(cd ${top_srcdir}/include; ${MAKE} install)
-	(cd ${top_srcdir}/parse; ${MAKE} install)
+#	-mkdir -p ${DESTDIR}${bindir}
+#	${INSTALL_PROGRAM} asir /usr/local/bin
+#	-mkdir -p ${DESTDIR}${asirdir}
+#	(cd ${top_srcdir}/lib; ${MAKE} install-doc install-lib)
+#	-rm -f ${DESTDIR}${bindir}/ox_asir${EXEEXT}
+#	(cd ${DESTDIR}${bindir} ; ${LN_S} asir${EXEEXT} ox_asir${EXEEXT})
+#	-(cd ${DESTDIR}${asirdir}; \
+#    rm -f asir${EXEEXT} ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT})
+#	(cd ${DESTDIR}${asirdir} ; \
+#	${LN_S} ../../bin/asir${EXEEXT} asir${EXEEXT} ; \
+#	${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \
+#	${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \
+#	${LN_S} asir${EXEEXT} ox_plot${EXEEXT})
+#	(cd ${top_srcdir}/include; ${MAKE} install)
+#	(cd ${top_srcdir}/parse; ${MAKE} install)
 
 install-lib:
-	(cd ${top_srcdir}/lib; ${MAKE} install-lib)
-	-(cd ${DESTDIR}${asirdir}; \
-	rm -f ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT})
-	(cd ${DESTDIR}${asirdir} ; \
-	${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \
-	${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \
-	${LN_S} asir${EXEEXT} ox_plot${EXEEXT})
-	-mkdir -p ${DESTDIR}${bindir}
-	-rm -f ${DESTDIR}${bindir}/asir${EXEEXT}
-	(cd ${DESTDIR}${bindir} ; ${LN_S} ../lib/asir/asir${EXEEXT} asir${EXEEXT})
+#	(cd ${top_srcdir}/lib; ${MAKE} install-lib)
+#	-(cd ${DESTDIR}${asirdir}; \
+#	rm -f ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT})
+#	(cd ${DESTDIR}${asirdir} ; \
+#	${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \
+#	${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \
+#	${LN_S} asir${EXEEXT} ox_plot${EXEEXT})
+#	-mkdir -p ${DESTDIR}${bindir}
+#	-rm -f ${DESTDIR}${bindir}/asir${EXEEXT}
+#	(cd ${DESTDIR}${bindir} ; ${LN_S} ../lib/asir/asir${EXEEXT} asir${EXEEXT})
 
 install-doc:
 	(cd ${top_srcdir}/lib; ${MAKE} install-doc)