Fixed installation of demo source from src/Demos to examples

Make/instdemosrc

@@ -26,12 +26,14 @@ TIFF_LIB=$2
 
 copy_demo_source()
 {
-    for d in `ls $TOPDIR/src/Demos/ | grep -v CVS`
+#DEMODIR=$TOPDIR/src/Demos/
+DEMODIR=$TOPDIR/examples
+    for d in `ls $DEMODIR | grep -v CVS`
     do
-        if [ -d $TOPDIR/src/Demos/$d ]
+        if [ -d $DEMODIR/$d ]
         then
             THISDIR=`pwd`
-            cd $TOPDIR/src/Demos/$d
+            cd $DEMODIR/$d
             [ -d $INST_DEMO_SRC/$d ] || mkdir -m 0755 -p $INST_DEMO_SRC/$d
             echo "         installing $d"
             for f in `$MAKE __instfiles | grep -v $MAKE`
@@ -115,7 +117,7 @@ echo "  generating make files ..."
 generate_makedefs > $INST_SRC/Make/makedefs
 generate_makerules > $INST_SRC/Make/makerules
 
-echo "  copying demo files ..."
+echo "  copying example files ..."
 copy_demo_source
 
 exit 0

Make/makedefs

@@ -92,7 +92,7 @@ INST_DEMOS     = $(INST_SHARE)/OpenSceneGraph/bin
 INST_SRC       = $(INST_SHARE)/OpenSceneGraph/src
 INST_DOC       = $(INST_SHARE)/OpenSceneGraph/doc
 INST_DATA      = $(INST_SHARE)/OpenSceneGraph/data
-INST_DEMO_SRC  = $(INST_SRC)/demos
+INST_DEMO_SRC  = $(INST_SRC)/examples
 LINK           = ln -sf
 INSTBINCMD     = install -m 755
 INSTDEVCMD     = install -m 644
@@ -443,7 +443,7 @@ ifeq ($(OS),MINGW)
   INST_SHARE_PREFIX = /usr/local/OpenSceneGraph
   INST_SRC          = $(INST_SHARE_PREFIX)/src
   INST_DEMOS        = $(INST_SHARE_PREFIX)/bin
-  INST_DEMO_SRC     = $(INST_SHARE_PREFIX)/src/demos
+  INST_DEMO_SRC     = $(INST_SHARE_PREFIX)/src/examples
   INST_DOC          = $(INST_SHARE_PREFIX)/doc
   INST_DATA         = $(INST_SHARE_PREFIX)/data
 endif

examples/osgconv/GNUmakefile

@@ -13,7 +13,7 @@ LIBS     += -losg -losgUtil -losgGA -losgDB $(GL_LIBS) $(OTHER_LIBS)
 INSTFILES = \
 	$(CXXFILES)\
 	$(HEADERFILES)\
-	Makefile.inst=Makefile
+	GNUmakefile.inst=GNUmakefile
 
 EXEC = osgconv