From 906f1de294a895484e58948bcd87e34846127ed8 Mon Sep 17 00:00:00 2001
From: Don BURNS <don@andesengineering.com>
Date: Tue, 16 Apr 2002 04:13:30 +0000
Subject: [PATCH] Fixed Solaris 'make distribution' for demo source.

---
 Make/distrules |  1 +
 Make/instrules |  2 --
 Make/makedefs  |  2 +-
 Make/makepkg   | 29 +++++++++++++++++++++++------
 Make/makerpms  |  8 +++++---
 5 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/Make/distrules b/Make/distrules
index 007ee8d30..93bc3b22f 100644
--- a/Make/distrules
+++ b/Make/distrules
@@ -6,6 +6,7 @@ distribution :
 		$(INST_PLUGINS)\
 		$(INST_INCLUDE)\
 		$(INST_DEMOS)\
+		$(INST_SRC)\
 		$(INST_DEMO_SRC)\
 		$(INST_DOC)\
 		$(INST_DATA)
diff --git a/Make/instrules b/Make/instrules
index 78385a7bd..a363500ff 100644
--- a/Make/instrules
+++ b/Make/instrules
@@ -28,7 +28,6 @@ __instbin:
 	
 
 __instdev:
-ifeq (0,1)
 	@for d in `ls -1  $(TOPDIR)/include/ | grep -v CVS`; \
 	do\
 	  if [ -d $(TOPDIR)/include/$$d ]; \
@@ -37,7 +36,6 @@ ifeq (0,1)
 		   INSTALL?="$(INSTDEVCMD)" __install;\
 	  fi\
 	done
-endif
 	@$(TOPDIR)/Make/instdemosrc \
 		$(TOPDIR)\
 		$(INST_LIBS)\
diff --git a/Make/makedefs b/Make/makedefs
index 370ca1206..bdfdf2ec1 100644
--- a/Make/makedefs
+++ b/Make/makedefs
@@ -95,7 +95,7 @@ endif
   LINKARGS          =  
   DYNAMICLIBRARYLIB = -ldl
   OSG_LIBS          = -losgGLUT -losgDB -losgUtil -losg 
-  FREETYPE_LIB      = -lfreetype
+  FREETYPE_LIB      = -L/usr/local/lib -lfreetype
   GLUT_LIB          = -lglut
   GL_LIBS           = -lGLU -lGL 
   X_LIBS            = -lXext -lXmu -lXi -lX11 
diff --git a/Make/makepkg b/Make/makepkg
index 96cd0ddcd..f36f616af 100644
--- a/Make/makepkg
+++ b/Make/makepkg
@@ -127,16 +127,15 @@ INST_LIBS=$3
 INST_PLUGINS=$4
 INST_INCLUDE=$5
 INST_DEMOS=$6
-INST_DEMO_SRC=$7
-INST_DOC=$8
-INST_DATA=$9
+INST_SRC=$7
+INST_DEMO_SRC=$8
+shift;shift; shift;shift; shift;shift; shift;shift;
+INST_DOC=$1
+INST_DATA=$2
 
 
 PKGSUBDIR=dist/PKG
 
-
-
-
 make_package\
 	"OpenSceneGraph" \
 	"Open Scene Graph - Run-time environment"\
@@ -145,6 +144,9 @@ make_package\
 
 make_installable "OpenSceneGraph"
 
+#
+# Capture include directories
+#
 SUBDIRS=`ls $TOPDIR/include | grep -v CVS`
 INSTARG=""
 for d in $SUBDIRS
@@ -153,6 +155,9 @@ do
     [ -d $dd ] && INSTARG="$INSTARG $dd"
 done
 
+#
+# Capthre Demos subdirectories
+#
 SUBDIRS=`ls $TOPDIR/src/Demos | grep -v CVS`
 for d in $SUBDIRS
 do
@@ -160,11 +165,23 @@ do
     [ -d $dd ] && INSTARG="$INSTARG $dd"
 done
 
+#
+# Capture Make subdirectory
+#
+dd="$INST_SRC"/"Make"
+
+echo dd is $dd
+ls $dd
+
+[ -d $dd ] && INSTARG="$INSTARG $dd"
+
+
 make_package\
 	"OpenSceneGraph-dev"\
 	"Open Scene Graph - Development environment"\
 	"An OpenGL based scene graph. This installation includes header files and demo program source files"\
 	$INSTARG
+
 make_installable "OpenSceneGraph-dev"
 
 
diff --git a/Make/makerpms b/Make/makerpms
index 821f19f5d..d50dd6a61 100644
--- a/Make/makerpms
+++ b/Make/makerpms
@@ -182,9 +182,11 @@ INST_LIBS=$3
 INST_PLUGINS=$4
 INST_INCLUDE=$5
 INST_DEMOS=$6
-INST_DEMO_SRC=$7
-INST_DOC=$8
-INST_DATA=$9
+INST_SRC=$7
+INST_DEMO_SRC=$8
+shift;shift; shift;shift; shift;shift; shift;shift;
+INST_DOC=$1
+INST_DATA=$2
 
 REV="`$TOPDIR""/bin/osgversion`"
 [ -z "$REV" ] && die  "makerpm: requires a functional $TOPDIR/bin/osgversion"