===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- OpenXM_contrib2/asir2000/Makefile.in	2003/03/20 07:06:31	1.18
+++ OpenXM_contrib2/asir2000/Makefile.in	2003/03/20 07:34:07	1.19
@@ -99,7 +99,13 @@ AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
 
 SUBDIRS = asm builtin engine fft include io lib parse ${PLOTDIR}
 
-DEFS = @DEFS@ -DASIR_LIBDIR=\"${prefix}/lib/asir\"
+asirdir = ${libdir}/asir
+asir_PROGRAMS = asir
+asir_SOURCES = parse/main.c
+asir_LDADD = libasir.a libasir-gc.a
+CLEANFILES = ${asir_LDADD} asir-openxm-${VERSION}.tgz
+
+DEFS = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\"
 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \
            -I${top_srcdir}/gc/include \
            @PARIINC@ @MPIINC@ @X_CFLAGS@
@@ -115,18 +121,12 @@ PLIB = parse/libparse.a
 
 ASIRLIB = ${BLIB} ${PLIB} ${IOLIB} ${PLLIB} ${ELIB} ${FLIB} ${ALIB}
 LIBS = @LIBS@ @PARILIB@ @MPILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} -lm ${EXTRALIBS}
-
-# EXTRALIBS = @EXTRALIBS@
-bin_PROGRAMS = asir
-asir_SOURCES = parse/main.c
-asir_LDADD = libasir.a libasir-gc.a
-CLEANFILES = ${asir_LDADD}
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
-bin_PROGRAMS = asir$(EXEEXT)
-PROGRAMS = $(bin_PROGRAMS)
+asir_PROGRAMS = asir$(EXEEXT)
+PROGRAMS = $(asir_PROGRAMS)
 
 am_asir_OBJECTS = main.$(OBJEXT)
 asir_OBJECTS = $(am_asir_OBJECTS)
@@ -172,29 +172,29 @@ $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-install-binPROGRAMS: $(bin_PROGRAMS)
+install-asirPROGRAMS: $(asir_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	$(mkinstalldirs) $(DESTDIR)$(asirdir)
+	@list='$(asir_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	  ; then \
 	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(asirdir)/$$f"; \
+	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(asirdir)/$$f; \
 	  else :; fi; \
 	done
 
-uninstall-binPROGRAMS:
+uninstall-asirPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	@list='$(asir_PROGRAMS)'; for p in $$list; do \
 	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	  echo " rm -f $(DESTDIR)$(asirdir)/$$f"; \
+	  rm -f $(DESTDIR)$(asirdir)/$$f; \
 	done
 
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+clean-asirPROGRAMS:
+	-test -z "$(asir_PROGRAMS)" || rm -f $(asir_PROGRAMS)
 main.$(OBJEXT): parse/main.c
 asir$(EXEEXT): $(asir_OBJECTS) $(asir_DEPENDENCIES) 
 	@rm -f asir$(EXEEXT)
@@ -395,7 +395,7 @@ check: check-recursive
 all-am: Makefile $(PROGRAMS)
 installdirs: installdirs-recursive
 installdirs-am:
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+	$(mkinstalldirs) $(DESTDIR)$(asirdir)
 
 install: install-recursive
 install-exec: install-exec-recursive
@@ -423,7 +423,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
+clean-am: clean-asirPROGRAMS clean-generic mostlyclean-am
 
 dist-all: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -441,11 +441,9 @@ info: info-recursive
 
 info-am:
 
-install-data-am:
+install-data-am: install-asirPROGRAMS
 
-install-exec-am: install-binPROGRAMS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-exec-am:
 
 install-info: install-info-recursive
 
@@ -461,16 +459,16 @@ mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-asirPROGRAMS uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-binPROGRAMS clean-generic clean-recursive dist dist-all \
+	clean-asirPROGRAMS clean-generic clean-recursive dist dist-all \
 	distcheck distclean distclean-compile distclean-generic \
 	distclean-recursive distclean-tags distdir dvi dvi-am \
 	dvi-recursive info info-am info-recursive install install-am \
-	install-binPROGRAMS install-data install-data-am \
+	install-asirPROGRAMS install-data install-data-am \
 	install-data-recursive install-exec install-exec-am \
 	install-exec-recursive install-info install-info-am \
 	install-info-recursive install-man install-recursive \
@@ -479,9 +477,10 @@ uninstall-info: uninstall-info-recursive
 	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
 	mostlyclean-compile mostlyclean-generic mostlyclean-recursive \
 	tags tags-recursive uninstall uninstall-am \
-	uninstall-binPROGRAMS uninstall-info-am \
+	uninstall-asirPROGRAMS uninstall-info-am \
 	uninstall-info-recursive uninstall-recursive
 
+# EXTRALIBS = @EXTRALIBS@
 
 umain.o: parse/main.c
 	${COMPILE} -DUINIT main.c -o umain.o
@@ -518,28 +517,22 @@ libasir.a: ${ASIRLIB}
 #	-rm $@
 #	ld -r $@ umain.o ${ASIRLIB} ${GLIB} ${LIBS} ${EXTRALIBS}
 
-install-exec-hook:
-	-mkdir -p ${DESTDIR}${prefix}/lib/asir
-	-if [ -x ${DESTDIR}${prefix}/bin/asir ]; then \
-		mv ${DESTDIR}${prefix}/bin/asir${EXEEXT} ${DESTDIR}${prefix}/lib/asir/ ; \
-	fi
-
 install-libasir: libasir.a
-	mkdir -p ${DESTDIR}${prefix}/lib
-	${INSTALL_DATA} libasir.a ${DESTDIR}${prefix}/lib/libasir${libasir_postfix}.a
+	mkdir -p ${DESTDIR}${libdir}
+	${INSTALL_DATA} libasir.a ${DESTDIR}${libdir}/libasir${libasir_postfix}.a
 
 install-openxm: asir${EXEEXT} libasir.a libasir-gc.a
-	-mkdir -p ${DESTDIR}${prefix}/bin
-	${INSTALL_PROGRAM} asir ${DESTDIR}${prefix}/bin/
-	-mkdir -p ${DESTDIR}${prefix}/lib/asir
+	-mkdir -p ${DESTDIR}${bindir}
+	${INSTALL_PROGRAM} asir ${DESTDIR}${bindir}
+	-mkdir -p ${DESTDIR}${asirdir}
 	(cd ${top_srcdir}/lib; ${MAKE} install-doc install-lib)
-	${INSTALL_DATA} libasir.a    ${DESTDIR}${prefix}/lib/libasir${libasir_postfix}.a
-	${INSTALL_DATA} libasir-gc.a ${DESTDIR}${prefix}/lib/libasir-gc.a
-	-rm -f ${DESTDIR}${prefix}/bin/ox_asir${EXEEXT}
-	(cd ${DESTDIR}${prefix}/bin ; ${LN_S} asir${EXEEXT} ox_asir${EXEEXT})
-	-(cd ${DESTDIR}${prefix}/lib/asir; \
+	${INSTALL_DATA} libasir.a    ${DESTDIR}${libdir}/libasir${libasir_postfix}.a
+	${INSTALL_DATA} libasir-gc.a ${DESTDIR}${libdir}/libasir-gc.a
+	-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}${prefix}/lib/asir ; \
+	(cd ${DESTDIR}${asirdir} ; \
 	${LN_S} ../../bin/asir${EXEEXT} asir${EXEEXT} ; \
 	${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \
 	${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \
@@ -549,15 +542,15 @@ install-openxm: asir${EXEEXT} libasir.a libasir-gc.a
 
 install-lib:
 	(cd ${top_srcdir}/lib; ${MAKE} install-lib)
-	-(cd ${DESTDIR}${prefix}/lib/asir; \
+	-(cd ${DESTDIR}${asirdir}; \
 	rm -f ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT})
-	(cd ${DESTDIR}${prefix}/lib/asir ; \
+	(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}${prefix}/bin
-	-rm -f ${DESTDIR}${prefix}/bin/asir${EXEEXT}
-	(cd ${DESTDIR}${prefix}/bin ; ${LN_S} ../lib/asir/asir${EXEEXT} asir${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)