===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Makefile,v
retrieving revision 1.20
retrieving revision 1.25
diff -u -p -r1.20 -r1.25
--- OpenXM/misc/packages/Makefile	2000/03/16 01:51:09	1.20
+++ OpenXM/misc/packages/Makefile	2000/09/25 07:12:43	1.25
@@ -1,12 +1,12 @@
-# $OpenXM: OpenXM/misc/packages/Makefile,v 1.19 2000/03/13 03:06:09 takayama Exp $
+# $OpenXM: OpenXM/misc/packages/Makefile,v 1.24 2000/09/19 08:42:16 takayama Exp $
 
-VERSION=1.1.2
+VERSION=1.1.3
 TAG=HEAD
-## TAG=RELEASE_1_1_2
+## TAG=RELEASE_1_1_3
 
 TAR_WORK=$(HOME)/tmp
 NAME=taka
-# It must be equal to TAR_WORK. To work as a super user. Used in build-on-pear.
+# It must be equal to TAR_WORK. To work as a super user. Used in build-on-pear-root.
 TAR_WORK_EXPLICIT=/home/${NAME}/tmp
 JDK=jdk1.1.8
 FTP_AREA=/export/home01/ftp/pub/OpenXM/${VERSION}
@@ -22,11 +22,13 @@ usage :
 	@echo "  print "
 	@echo "Do not forget to put java and javac in your search path." 
 	@echo "Put your rcvs script by the name cvs-OpenXM under your search path."
+	@echo "OpenXM must be under the home directory. Otherwise, input like make OpenXM_HOME=/hoge/hoge/OpenXM ..."
 	@echo "   (See Generic/openxm/Makefile for details) "
 	@echo "1.  generate-tar-balls"
 	@echo "  (update-plist)"
-	@echo "2.  build-on-orange (do not forget to set .rpmrc. See Linux/RPM/Makefile)"
-	@echo "3.  build-on-pear (do it as a super user)"
+	@echo "  (or  generate-tar-balls-without-update-plist) "
+	@echo "2.  build-on-new-orange (do not forget to set .rpmrc. See Linux/RPM/Makefile)"
+	@echo "3.  build-on-pear-root (do it as a super user)"
 	@echo "4.  build-on-redhat (do not forget to set .rpmrc)"
 	@echo "5.  build-on-unkei"
 	@echo "6.  copy-to-ftp-area "
@@ -59,21 +61,29 @@ generate-tar-balls:
 update-plist:
 	(cd FreeBSD ; make VERSION=${VERSION}  TAG=${TAG} update-plist )
 
+generate-tar-balls-without-update-plist:
+	-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)
+	(cd FreeBSD   ; make TAG=${TAG} VERSION=${VERSION} make-tar-ball-for-openxm-port)
+
 prepare-build-rpm:
 	(cd Linux/RPM ; make make-directory)
 	(cd Linux/RPM ; make link-for-real-openxm)
 
 # set path=(/usr/local/jdk1.1.8/bin $path) ; rehash
-# build-on-orange should depend on clean-Generic-openxm-work in a future.
-build-on-orange: prepare-build-rpm
+# build-on-new-orange should depend on clean-Generic-openxm-work in a future.
+build-on-new-orange: prepare-build-rpm
 	(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)
 	(cd Linux/RPM ; make  TAG=${TAG} VERSION=${VERSION} build-shared-rpm)
-	(cp Linux/RPM/work/RPMS/i386/*.rpm ${TAR_WORK})
+	-(cp Linux/RPM/work/RPMS/i386/*.rpm ${TAR_WORK})
+	-(cp Linux/RPM/work/RPMS/noarch/*.rpm ${TAR_WORK})
 
 # You should be a super user.
-build-on-pear:
+build-on-pear-root:
 	cp ${TAR_WORK_EXPLICIT}/openxm-${VERSION}.tar.gz /usr/ports/distfiles
 	(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)
@@ -94,8 +104,9 @@ build-on-unkei: clean-Generic-openxm-work
 
 copy-to-ftp-area:
 	-mkdir ${FTP_AREA}
-	cp ${TAR_WORK}/openxm*rpm ${FTP_AREA}
-	cp ${TAR_WORK}/openxm01-${VERSION}.tar.gz ${FTP_AREA}
-	cp ${TAR_WORK}/OpenXM-*.tgz ${FTP_AREA}
-	cp ${TAR_WORK}/openxm-${VERSION}.tgz ${FTP_AREA}
+	-cp ${TAR_WORK}/openxm*rpm ${FTP_AREA}
+	-cp ${TAR_WORK}/openxm-${VERSION}.tar.gz ${FTP_AREA}
+	-cp ${TAR_WORK}/OpenXM-*.tgz ${FTP_AREA}
+	-cp ${TAR_WORK}/openxm-${VERSION}.tgz ${FTP_AREA}
+	-cp ${TAR_WORK}/openxm-port.tar.gz ${FTP_AREA}
 	ls -l ${FTP_AREA}