From 4c4d99f19ac4156cfc0ece21be5cdad0e384782b Mon Sep 17 00:00:00 2001
From: Don BURNS <don@andesengineering.com>
Date: Fri, 28 Sep 2001 19:36:58 +0000
Subject: [PATCH] Cleaned up inst rules a bit...

---
 Make/instrules   | 33 +++++++++++++++++----------------
 Makefile         | 10 ++--------
 src/osg/Makefile | 22 ----------------------
 3 files changed, 19 insertions(+), 46 deletions(-)

diff --git a/Make/instrules b/Make/instrules
index 1a1bb1019..dfc8945a4 100644
--- a/Make/instrules
+++ b/Make/instrules
@@ -61,22 +61,23 @@ __install : $(TARGET) $(LIB)
 	  else\
 		echo No loaders installed ...;\
 	fi
-	@if [ -n "$(TARGET_DATA_FILES)" ] ;\
-	  then\
-	      if [ -n "$(OSGDATA)" ] ;\
-	      then\
-	          for f in $(TARGET_DATA_FILES);\
-	          do\
-	              (echo copying $(OSGDATA)/$$f to  $(TARGET_DATA)/$$f; \
-	              cp -f $(OSGDATA)/$$f $(TARGET_DATA)/$$f; )\
-	          done\
-	      else\
-		  echo;\
-	          echo "-------------- > Please define OSGDATA";\
-		  echo; \
-		  [ -n "$(OSGDATA)" ] && echo > /dev/null;\
-	      fi\
-	  fi
+# deprecate OSGDATA
+#	@if [ -n "$(TARGET_DATA_FILES)" ] ;\
+#	  then\
+#	      if [ -n "$(OSGDATA)" ] ;\
+#	      then\
+#	          for f in $(TARGET_DATA_FILES);\
+#	          do\
+#	              (echo copying $(OSGDATA)/$$f to  $(TARGET_DATA)/$$f; \
+#	              cp -f $(OSGDATA)/$$f $(TARGET_DATA)/$$f; )\
+#	          done\
+#	      else\
+#		  echo;\
+#	          echo "-------------- > Please define OSGDATA";\
+#		  echo; \
+#		  [ -n "$(OSGDATA)" ] && echo > /dev/null;\
+#	      fi\
+#	  fi
 
 
 __instlinks : $(TARGET) $(LIB) 
diff --git a/Makefile b/Makefile
index 2d96863ab..cc11a79df 100644
--- a/Makefile
+++ b/Makefile
@@ -108,14 +108,8 @@ dev: $(MAKE_PREP)
 	$(MAKE) clobber;
 	(cd ..; tar cvf - $(VERSION) | gzip > osg-`date "+%Y%m%d"`.tar.gz)
 
-install :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) install; cd ..;  done
-
-instlinks :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) instlinks; cd ..;  done
-
-instclean :
-	for f in $(DIRS)  ; do cd $$f; $(MAKE) instclean; cd ..;  done
+install instlinks instclean :
+	export OSGHOME=`pwd`; for f in $(DIRS)  ; do cd $$f; $(MAKE) $@; cd ..;  done
 
 instcheck :
 	diff -q include/osg/       /usr/include/osg/
diff --git a/src/osg/Makefile b/src/osg/Makefile
index d8c236d80..436afee15 100644
--- a/src/osg/Makefile
+++ b/src/osg/Makefile
@@ -121,28 +121,6 @@ TARGET_INCLUDE_FILES = \
 	osg/ref_ptr\
 
 
-TARGET_DATA_FILES = \
-	cessna.osg\
-	cow.osg\
-	dumptruck.osg\
-	e-s-bike.osg\
-	flight_park.fly\
-	glider.osg\
-	ncc1701d.osg\
-	paraglider.osg\
-	torus.osg\
-	turtle.osg\
-	Test/CullFace.osg\
-	Test/Point.osg\
-	Test/PolygonOffset.osg\
-	Images/lz.rgb\
-	Images/reflect.rgb\
-	Images/tank.rgb\
-	Images/tree0.rgba\
-	Images/water.rgb\
-	Images/white.rgb\
-
-
 LIBS    =  -lGLU -lGL -lm
 
 LIB	= ../../lib/lib$(TARGET_BASENAME).so