===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Makefile,v
retrieving revision 1.16
retrieving revision 1.23
diff -u -p -r1.16 -r1.23
--- OpenXM/misc/packages/Makefile	2000/03/13 00:57:44	1.16
+++ OpenXM/misc/packages/Makefile	2000/03/18 08:06:14	1.23
@@ -1,4 +1,4 @@
-# $OpenXM: OpenXM/misc/packages/Makefile,v 1.15 2000/03/13 00:52:20 takayama Exp $
+# $OpenXM: OpenXM/misc/packages/Makefile,v 1.22 2000/03/16 12:23:01 takayama Exp $
 
 VERSION=1.1.2
 TAG=HEAD
@@ -22,9 +22,11 @@ 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 "  (or  generate-tar-balls-without-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 "4.  build-on-redhat (do not forget to set .rpmrc)"
@@ -45,12 +47,12 @@ print:
 	$(PS) FreeBSD/openxm-ports/openxm-1.1.2/Makefile | $(LPR)	
 	$(PS) FreeBSD/Makefile | $(LPR)	
 
+clean-Generic-openxm-work:
+	-(cd Generic/openxm ; make clean-work ; make fetch)
 
 generate-tar-balls:
 	-mkdir ${TAR_WORK}
 	make clean
-	(cd Linux/RPM ; make make-directory)
-	(cd Linux/RPM ; make link-for-real-openxm)
 	(cd Generic/openxm ; make TAG=${TAG} VERSION=${VERSION} tar-ball)
 	(cd Generic/openxm ; make  TAG=${TAG} VERSION=${VERSION} tar-ball-01)
 	make update-plist
@@ -59,13 +61,26 @@ 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:
+# build-on-orange should depend on clean-Generic-openxm-work in a future.
+build-on-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:
@@ -73,18 +88,19 @@ build-on-pear:
 	(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 clean-for-make)
+build-on-redhat: prepare-build-rpm clean-Generic-openxm-work
+	(cd Generic/openxm ; make TAG=${TAG} VERSION=${VERSION} TAR_WORK=${TAR_WORK} tar-ball)
 	(cd Generic/openxm ; make  TAG=${TAG} VERSION=${VERSION} binary-tar-ball)
 	(cd Linux/RPM ; make build-binary-rpm)
 	(cp Linux/RPM/work/RPMS/i386/*.rpm ${TAR_WORK})
 
 # set path=(/usr/ccs/bin /usr/local/bin $path); rehash
-# (Note for taka). On unkei, cd Solaris/OpenXM/misc/packages and make build-on-unkei
-build-on-unkei:
-	(cd Generic/openxm ; make fetch)
-	(cd Generic/openxm ; make clean-for-make)
-	(cd Generic/openxm ; make  TAG=${TAG} VERSION=${VERSION} binary-tar-ball)
+# setenv OpenXM_HOME  xxx-yyy  
+# (Note for taka). On unkei, cd Solaris/OpenXM/misc/packages, 
+#                  setenv OpenXM_HOME $HOME/Solaris/OpenXM 
+#                  and make OpenXM_HOME=$OpenXM_HOME build-on-unkei
+build-on-unkei: clean-Generic-openxm-work
+	(cd Generic/openxm ; make  TAG=${TAG} VERSION=${VERSION} OpenXM_HOME=${OpenXM_HOME} binary-tar-ball)
 
 copy-to-ftp-area:
 	-mkdir ${FTP_AREA}