===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Makefile,v
retrieving revision 1.11
retrieving revision 1.13
diff -u -p -r1.11 -r1.13
--- OpenXM/misc/packages/Makefile	2000/03/11 07:10:02	1.11
+++ OpenXM/misc/packages/Makefile	2000/03/11 10:32:27	1.13
@@ -1,4 +1,4 @@
-# $OpenXM: OpenXM/misc/packages/Makefile,v 1.10 2000/03/11 06:22:32 takayama Exp $
+# $OpenXM: OpenXM/misc/packages/Makefile,v 1.12 2000/03/11 08:58:32 takayama Exp $
 
 VERSION=1.1.2
 TAG=HEAD
@@ -37,18 +37,19 @@ clean :
 	-(cd Linux/RPM ; make clean)
 
 print:
+	$(PS) Makefile | $(LPR)	
 	$(PS) Generic/openxm/Makefile | $(LPR)	
 	$(PS) Linux/RPM/Makefile | $(LPR)	
 	$(PS) Linux/RPM/openxm-*spec.in | $(LPR)	
 	$(PS) FreeBSD/openxm-ports/openxm-1.1.2/Makefile | $(LPR)	
 	$(PS) FreeBSD/Makefile | $(LPR)	
-	$(PS) Makefile | $(LPR)	
 
 
 generate-tar-balls:
 	-mkdir ${TAR_WORK}
 	make clean
 	(cd Generic/openxm ; make TAG=${TAG} VERSION=${VERSION} tar-ball)
+	(cd Generic/openxm ; make  TAG=${TAG} VERSION=${VERSION} tar-ball-01)
 	make update-plist
 	(cd FreeBSD   ; make TAG=${TAG} VERSION=${VERSION} make-tar-ball-for-openxm-port)
 	(cd Linux/RPM ; make make-directory)
@@ -58,7 +59,6 @@ update-plist:
 	(cd FreeBSD ; make VERSION=${VERSION}  TAG=${TAG} update-plist )
 
 build-on-orange:
-	(cd Generic/openxm ; make  TAG=${TAG} VERSION=${VERSION} tar-ball-01)
 	(cd Generic/openxm ; make  TAG=${TAG} VERSION=${VERSION} binary-tar-ball)
 	(cd Generic/openxm ; make  TAG=${TAG} VERSION=${VERSION} shared-tar-ball)
 	(cd Generic/openxm ; make  TAG=${TAG} VERSION=${VERSION} clean-work)
@@ -68,8 +68,8 @@ build-on-orange:
 # You should be a super user.
 build-on-pear:
 	cp ${TAR_WORK_EXPLICIT}/openxm-${VERSION}.tar.gz /usr/ports/distfiles
-	(cd /usr/ports/math ; tar xzvf ${TAR_WORK_EXPLICIT}/openxm-port.tar.gz)
-	(PATH=/usr/local/${JDK}/java ; export PATH ; cd FreeBSD/openxm-ports/openxm-${VERSION} ; make install ; make package ; make deinstall ; cp openxm-${VERSION}.tgz ${TAR_WORK_EXPLICIT} ; chown ${NAME} ${TAR_WORK_EXPLICIT}/openxm-${VERSION}.tgz)
+	(cd /usr/ports/math ; /bin/rm -rf openxm ; tar xzvf ${TAR_WORK_EXPLICIT}/openxm-port.tar.gz)
+	(PATH=/usr/local/${JDK}/bin:$(PATH) ; export PATH ; cd /usr/ports/math/openxm ; make install ; make package ; make deinstall ; cp openxm-${VERSION}.tgz ${TAR_WORK_EXPLICIT} ; chown ${NAME} ${TAR_WORK_EXPLICIT}/openxm-${VERSION}.tgz)
 
 build-on-redhat:
 	(cd Generic/openxm ; make  TAG=${TAG} VERSION=${VERSION} binary-tar-ball)