===================================================================
RCS file: /oss/CVS/cvs/inventor/GNUmakefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- inventor/GNUmakefile	2000/08/17 23:33:03	1.2
+++ inventor/GNUmakefile	2000/09/18 11:10:05	1.3
@@ -1,41 +1,27 @@
-#!gmake
-SHELL = /bin/sh
+IVDEPTH = .
+include $(IVDEPTH)/make/ivcommondefs
 
-install all::
-	cd tools/ppp; $(MAKE) install
-	cd libimage;$(MAKE) install
-	# uncomment the following to get a debug build
-	#export LIBTYPE=debug
-	cd lib;$(MAKE) install
-	cd libSoXt;$(MAKE) install
-	if [ ! -d $(IVROOT)/usr/lib/Inventor/Debug ]; then \
-	  mkdir -p $(IVROOT)/usr/lib/Inventor/Debug ; \
-	fi
-	#cp -f $(IVROOT)/usr/lib/libInventor.so $(IVROOT)/usr/lib/Inventor/Debug
-	#cp -f $(IVROOT)/usr/lib/libInventorXt.so $(IVROOT)/usr/lib/Inventor/Debug
-	cd apps;$(MAKE) install
-	cd data;$(MAKE) install
-	cd doc;$(MAKE) install
-
-clobber::
-	cd tools/ppp; $(MAKE) clobber
-	cd libimage;$(MAKE) clobber
-	cd lib;$(MAKE) clobber
-	cd libSoXt;$(MAKE) clobber
-	cd apps;$(MAKE) clobber
-	cd doc;$(MAKE) clobber
-	if [ -e usr ] ; then \
-		rm -rf usr ; \
-	fi
-	if [ -e opt ] ; then \
-		rm -rf opt ; \
-	fi
+
+# Use of LSUBDIRS is to allow override using environment variable without
+# conflicting with SUBDIRS in subdirectory makefiles.
+
+LSUBDIRS = libimage tools lib libSoXt doc data apps
+SUBDIRS = $(LSUBDIRS)
+
+all install $(COMMONTARGS):
+	$(SUBDIRS_MAKERULE)
+
+
+SPECS = sgi-OpenInventor-clients.rpm.spec \
+	sgi-OpenInventor-data.rpm.spec \
+	sgi-OpenInventor-devel.rpm.spec
+
+TARBALL = oiv.tar.gz
 
 rpms:
-	cd .. ; rm -f oiv.tar.gz ; tar zcvf oiv.tar.gz inventor
-	su -c "cp -f ../oiv.tar.gz /usr/src/redhat/SOURCES"
-	su -c "cd build ; rpm -bb sgi-OpenInventor.rpm.spec"
-	su -c "cd build ; rpm -bb sgi-OpenInventor-devel.rpm.spec"
-	su -c "cd build ; rpm -bb sgi-OpenInventor-data.rpm.spec"
-	su -c "cd build ; rpm -bb sgi-OpenInventor-demos.rpm.spec"
+	cd ..; rm -f $(TARBALL); tar zcvf $(TARBALL) inventor
+	su -c "cp -f ../$(TARBALL) /usr/src/redhat/SOURCES"
 
+	for s in $(SPECS); do \
+	  (su -c "cd build; rpm -bb $$s") \
+	done;