===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Generic/openxm/Makefile,v
retrieving revision 1.8
retrieving revision 1.16
diff -u -p -r1.8 -r1.16
--- OpenXM/misc/packages/Generic/openxm/Makefile	2000/03/10 10:25:21	1.8
+++ OpenXM/misc/packages/Generic/openxm/Makefile	2000/03/16 10:07:04	1.16
@@ -1,9 +1,12 @@
-# $OpenXM: OpenXM/misc/packages/Generic/openxm/Makefile,v 1.7 2000/03/10 03:20:26 takayama Exp $
+# $OpenXM: OpenXM/misc/packages/Generic/openxm/Makefile,v 1.15 2000/03/13 02:41:37 takayama Exp $
 # This is a Makefile to generate source and binary distributions of
 # the OpenXM package on various plathomes.
 
 # If you add new directory under OpenXM/lib, edit SHARED_FILES.
 
+# If you add new files to be installed under /usr/local/bin, man, etc,
+# you have to edit several files. See OpenXM/misc/packages/README.
+
 ## For committers: prepare cvs-OpenXM under your search path 
 ## to access to CVS servers.
 RCVS=cvs-OpenXM -d kerberos.math.sci.kobe-u.ac.jp:/usr/cvs
@@ -16,6 +19,7 @@ RCVS=cvs-OpenXM -d kerberos.math.sci.kobe-u.ac.jp:/usr
 ## Configurations.
 ## OpenXM Version Number.
 VERSION=1.1.2
+TAG=HEAD
 
 RELEASE=
 ## If you like to have a release name as a part of tar ball, then uncomment
@@ -39,18 +43,20 @@ WORK=work/openxm-${VERSION}
 
 ### Common
 SHARED_FILES = OpenXM/Copyright OpenXM/doc OpenXM/include OpenXM/man \
-               OpenXM/rc \
                OpenXM/lib/asir-contrib OpenXM/lib/java-support \
                OpenXM/lib/k097 OpenXM/lib/math OpenXM/lib/pari \
                OpenXM/lib/sm1 OpenXM/lib/asir 
-BINARY_FILES = OpenXM/bin OpenXM/lib/*.a OpenXM/lib/*.so*
+BINARY_FILES = OpenXM/bin OpenXM/lib/*.a OpenXM/lib/*.so* OpenXM/lib/*.a.* \
+               OpenXM/rc
+MAN_PAGES    = openxm.1 sm1.1
+
 EXECUTABLES=gnuplot4ox gnuplot_x11 k0 ox ox_sm1 oxlog oxweave sm1 tigers ox_math
 
 usage :
 	@echo "Targets are "
 	@echo "  fetch  :   get the sources from the cvs server under $(WORK)"
-	@echo "  tar-ball : generate OpenXM-source.tgz under $(TAR_WORK)"
-	@echo "  tar-ball-01 : generate OpenXM-source-01.tgz under $(TAR_WORK)"
+	@echo "  tar-ball : generate openxm-${VERSION}.tar.gz under $(TAR_WORK)"
+	@echo "  tar-ball-01 : generate openxm01-${VERSION}.tar.gz under $(TAR_WORK)"
 	@echo "  binary-tar-ball : generate OpenXM-binary-OS-CPU.tgz under $(TAR_WORK)"
 	@echo "  shared-tar-ball : generate OpenXM-shared.tgz under $(TAR_WORK)"
 	@echo "  clean-work "
@@ -92,9 +98,13 @@ all-ideal : configure
 	@touch .all_done
 
 install : install-binary-files install-shared-files
+	make install-shell-scripts PREFIX=${prefix}
+
+install-shell-scripts:
 # Install shell scripts to ${prefix}/bin, which is typically /usr/local/bin
 	(cd ${prefix}/OpenXM/rc ; make ; make install PREFIX=${prefix})
 
+
 install-binary-files:  all
 	@echo "install-binary-files with PREFIX= "
 	@echo ${prefix}
@@ -107,8 +117,11 @@ install-shared-files:  all
 	@echo ${prefix}
 	tar cf - ${SHARED_FILES} | (cd ${prefix} ; tar xf -)
 
+install-man-pages-for-rpm:
+	-(cd ${prefix}/OpenXM/man/man1 ; cp $(MAN_PAGES) ${PREFIX}/man/man1)
+
 install.man : install
-	-cp ${prefix}/OpenXM/man/man1/sm1.1 ${prefix}/OpenXM/man/man1/openxm.1 ${MAN_DIR}
+	-(cd ${prefix}/OpenXM/man/man1 ; cp ${MAN_PAGES} ${MAN_DIR})
 	-gzip ${MAN_DIR}/sm1.1 ${MAN_DIR}/openxm.1 
 
 clean :
@@ -129,7 +142,7 @@ clean-installed-openxm:
 fetch :
 	@if [ ! -f ./.fetch_done ]; then \
 		/bin/rm -rf work ; mkdir work ; mkdir ${WORK} ; \
-		( cd ${WORK} ; $(RCVS) export -rHEAD OpenXM OpenXM_contrib OpenXM_contrib2) ; \
+		( cd ${WORK} ; ${RCVS} export -r${TAG} OpenXM OpenXM_contrib OpenXM_contrib2) ; \
 		cp Makefile ${WORK}/Makefile ; \
 	fi
 	@touch ./.fetch_done
@@ -147,7 +160,7 @@ tar-ball-01: fetch
 	fi
 	@touch ./.tar-ball-01_done
 
-binary-tar-ball : tar-ball-01
+binary-tar-ball : fetch
 	cp Makefile ${WORK}/Makefile 
 	rm -rf ${INSTALL_WORK}
 	mkdir ${INSTALL_WORK} ${INSTALL_WORK}/bin ${INSTALL_WORK}/man 
@@ -155,18 +168,18 @@ binary-tar-ball : tar-ball-01
 	(cd ${WORK} ; make install-binary-files PREFIX=${INSTALL_WORK})
 	(cd ${INSTALL_WORK} ; tar czf ${TAR_WORK}/OpenXM-binary-$(TYPE)$(RELEASE).tgz ${BINARY_FILES})
 
-shared-tar-ball : tar-ball-01
+shared-tar-ball : fetch
 	cp Makefile ${WORK}/Makefile 
 	rm -rf ${INSTALL_WORK}
 	mkdir ${INSTALL_WORK} ${INSTALL_WORK}/bin ${INSTALL_WORK}/man 
 	mkdir ${INSTALL_WORK}/man/man1
 	(cd ${WORK} ; make install-shared-files PREFIX=${INSTALL_WORK})
-	(cd ${INSTALL_WORK} ; tar czf ${TAR_WORK}/OpenXM-shared-$(TYPE)$(RELEASE).tgz ${SHARED_FILES})
+	(cd ${INSTALL_WORK} ; tar czf ${TAR_WORK}/OpenXM-shared.tgz ${SHARED_FILES})
 
 
 clean-work :
 	/bin/rm -rf .*_done *~
-	/bin/rm -rf work
+	/bin/rm -rf work work-fake
 
 clean-for-make:
 	(cd ${WORK} ; make distclean)