===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- OpenXM_contrib2/asir2000/Makefile.am	2003/03/07 15:55:05	1.4
+++ OpenXM_contrib2/asir2000/Makefile.am	2003/03/07 17:00:45	1.5
@@ -1,4 +1,4 @@
-# $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.3 2003/03/04 06:40:10 ohara Exp $
+# $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.4 2003/03/07 15:55:05 ohara Exp $
 
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
 if USE_PLOT
@@ -66,27 +66,26 @@ install-exec-hook:
 		mv ${prefix}/bin/asir${EXEEXT} ${prefix}/lib/asir/ ; \
 	fi
 
-install-symlink-openxm:
-	-rm -f ${prefix}/bin/ox_asir${EXEEXT}
-	(cd ${prefix}/bin ; ${LN_S} asir${EXEEXT} ox_asir${EXEEXT})
-	-mkdir -p ${prefix}/lib/asir
-	(cd ${prefix}/lib/asir ; \
-	${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})
-
 install-libasir: libasir.a
 	mkdir -p ${prefix}/lib
 	${INSTALL_DATA} libasir.a ${prefix}/lib/libasir${libasir_postfix}.a
 
 install-openxm: asir${EXEEXT} libasir.a libasir-gc.a
+	-mkdir -p ${prefix}/bin
+	${INSTALL_PROGRAM} asir ${prefix}/bin/
 	-mkdir -p ${prefix}/lib/asir
-	${INSTALL_PROGRAM} asir ${prefix}/lib/asir/
 	(cd ${top_srcdir}/lib; ${MAKE} install-doc install-lib)
-	-mkdir -p ${prefix}/lib
 	${INSTALL_DATA} libasir.a    ${prefix}/lib/libasir${libasir_postfix}.a
 	${INSTALL_DATA} libasir-gc.a ${prefix}/lib/libasir-gc.a
+	-rm -f ${prefix}/bin/ox_asir${EXEEXT}
+	(cd ${prefix}/bin ; ${LN_S} asir${EXEEXT} ox_asir${EXEEXT})
+	-(cd ${prefix}/lib/asir; \
+    rm -f asir${EXEEXT} ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT})
+	(cd ${prefix}/lib/asir ; \
+	${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})
 
 install-lib:
 	(cd ${top_srcdir}/lib; ${MAKE} install-lib)