===================================================================
RCS file: /home/cvs/OpenXM/misc/packages/Linux/RPM/Makefile,v
retrieving revision 1.4
retrieving revision 1.8
diff -u -p -r1.4 -r1.8
--- OpenXM/misc/packages/Linux/RPM/Makefile	2000/03/10 10:25:21	1.4
+++ OpenXM/misc/packages/Linux/RPM/Makefile	2000/03/16 07:55:56	1.8
@@ -1,4 +1,4 @@
-# $OpenXM: OpenXM/misc/packages/Linux/RPM/Makefile,v 1.3 2000/03/09 09:26:26 takayama Exp $
+# $OpenXM: OpenXM/misc/packages/Linux/RPM/Makefile,v 1.7 2000/03/16 06:40:41 takayama Exp $
 # *If you do not like to use /usr/src/redhat area to put *rpm files, 
 #  do as follows.
 # 0. Generate ~/.rpmrc and set the TopDir for the work.
@@ -35,8 +35,10 @@
 #  -ivh : Install,  -e openxm-1.1.2-test : remove, 
 #  -qvl openxm-1.1.2-test : list.
 
-OLE=$(HOME)/OpenXM/src/kan96xx/Doc/ole -q
-RPM_BUILD_BINARY_ROOT=/var/tmp/openxm-root
+OLE_DIR=../../../../../OpenXM/src/kan96xx/Doc
+OLE=${OLE_DIR}/ole -q
+RPM_BUILD_BINARY_ROOT=/var/tmp/openxm-binary-root
+RPM_BUILD_SHARED_ROOT=/var/tmp/openxm-shared-root
 
 usage :
 	@echo "Usage:"
@@ -49,7 +51,7 @@ build-binary-rpm: openxm-binary-spec
 	(cd work/SPECS ; rpm -bb openxm-binary.spec )
 
 build-shared-rpm: openxm-shared-spec
-	(cd work/SPECS ; rpm -bb openxm-shared.spec )
+	(cd work/SPECS ; rpm --buildarch noarch -bb openxm-shared.spec )
 
 ## This is obsolete
 build-rpm: openxm-spec
@@ -58,29 +60,41 @@ build-rpm: openxm-spec
 make-directory: clean
 	mkdir work
 	mkdir work/SOURCES work/SPECS work/BUILD work/RPMS 
-	mkdir work/RPMS/i386 work/SPRMS
+	mkdir work/RPMS/i386 work/RPMS/noarch work/SPRMS
 	mkdir ${RPM_BUILD_BINARY_ROOT}
 	mkdir ${RPM_BUILD_BINARY_ROOT}/usr
 	mkdir ${RPM_BUILD_BINARY_ROOT}/usr/local
 	mkdir ${RPM_BUILD_BINARY_ROOT}/usr/local/bin
 	mkdir ${RPM_BUILD_BINARY_ROOT}/usr/local/man
 	mkdir ${RPM_BUILD_BINARY_ROOT}/usr/local/man/man1
+	mkdir ${RPM_BUILD_SHARED_ROOT}
+	mkdir ${RPM_BUILD_SHARED_ROOT}/usr
+	mkdir ${RPM_BUILD_SHARED_ROOT}/usr/local
+	mkdir ${RPM_BUILD_SHARED_ROOT}/usr/local/bin
+	mkdir ${RPM_BUILD_SHARED_ROOT}/usr/local/man
+	mkdir ${RPM_BUILD_SHARED_ROOT}/usr/local/man/man1
 
 
-openxm-spec:
+openxm-spec:  make-ole
 	rm -rf work/SPECS/openxm.spec
 	${OLE} <openxm.spec.in >work/SPECS/openxm.spec
 
-openxm-binary-spec:
+openxm-binary-spec: make-ole
 	rm -rf work/SPECS/openxm-binary.spec
 	${OLE} <openxm-binary.spec.in >work/SPECS/openxm-binary.spec
 
-openxm-shared-spec:
+openxm-shared-spec: make-ole
 	rm -rf work/SPECS/openxm-shared.spec
 	${OLE} <openxm-shared.spec.in >work/SPECS/openxm-shared.spec
 
+make-ole :
+	@if test ! -f ${OLE_DIR}/ole ; \
+	then \
+		(cd $(OLE_DIR) ; make ole) ;  \
+	fi
+
 clean :
-	-/bin/rm -rf work ${RPM_BUILD_BINARY_ROOT}
+	-/bin/rm -rf work ${RPM_BUILD_BINARY_ROOT} ${RPM_BUILD_SHARED_ROOT}
 
 
 link-for-debug: make-directory clean