Added more to instrules and makedefs.new Folded in Randall Hopper's

changes for FreeBSD

Make/instrules.new

@@ -2,11 +2,11 @@ install  : instbin instdev
 
 instbin :
 	@$(MAKE) INSTSRC=$(TOPDIR)/bin INSTDEST=$(INST_DEMOS) \
-		INSTARGS="$(INSTARGS) -m 755" __install
+		INSTALL?="$(INSTBIN)" __install
 	@$(MAKE) INSTSRC=$(TOPDIR)/lib INSTDEST=$(INST_LIBS) \
-		INSTARGS="$(INSTARGS) -m 755" __install
+		INSTALL?="$(INSTBIN)" __install
 	@$(MAKE) INSTSRC=$(TOPDIR)/lib/osgPlugins INSTDEST=$(INST_PLUGINS)\
-		INSTARGS="$(INSTARGS) -m 755" __install
+		INSTALL?="$(INSTBIN)" __install
 
 
 instdev :
@@ -15,7 +15,7 @@ instdev :
 	  if [ -d $(TOPDIR)/include/$$d ]; \
 	  then \
 	    $(MAKE) INSTSRC=$(TOPDIR)/include/$$d INSTDEST=$(INST_INCLUDE)/$$d\
-		   INSTARGS="$(INSTARGS) -m 644" __install;\
+		   INSTALL?="$(INSTDEV)" __install;\
 	  fi\
 	done
 	@for d in `ls -1  $(TOPDIR)/src/Demos | grep -v CVS`; \
@@ -23,17 +23,18 @@ instdev :
 	  if [ -d $(TOPDIR)/src/Demos/$$d ]; \
 	  then \
 	    $(MAKE) INSTSRC=$(TOPDIR)/src/Demos/$$d INSTDEST=$(INST_DEMO_SRC)/$$d\
-		   INSTARGS="$(INSTARGS) -m 644" __install;\
+		   INSTALL?="$(INSTDEV)" __install;\
 	  fi\
 	done
 
 instlinks : instlinksbin instlinksdev
 
 instlinksbin :
-	@$(MAKE) INSTARGS=" -t " instbin
+	$(MAKE) INSTALL="$(INSTLINKBIN)" instbin
 
 instlinksdev :
-	@$(MAKE) INSTARGS=" -t " instdev
+	$(MAKE) INSTALL="$(INSTLINKDEV)" instbin
+
 
 
 __install :
@@ -48,11 +49,9 @@ __install :
 	  do\
 	    if [ -f $$f ] ; \
 	    then \
-	        echo install $(INSTARGS) $$f $(INSTDEST);\
-	        install $(INSTARGS) $$f $(INSTDEST);\
+	        echo $(INSTALL) $$f $(INSTDEST);\
 	    fi\
 	  done\
 	fi
 
 
-	

Make/makedefs.new

@@ -29,7 +29,11 @@ INST_INCLUDE  = /usr/share/OpenSceneGraph/include
 INST_DEMO_SRC = /usr/share/OpenSceneGraph/src/demos
 INST_DATA     = /usr/share/OpenSceneGraph/data
 
-LINK       = ln -sf
+LINK          = ln -sf
+INSTBIN       = install -m 755
+INSTDEV       = install -m 644
+INSTLINKBIN   = $(LINK)
+INSTLINKDEV   = $(LINK)
 
 
 ALL_TARGETS = \
@@ -65,6 +69,7 @@ ifeq ($(OS),SunOS)
   OTHER_LIBS        = -lCstd
   SO_EXT            = so
   PLUGIN_EXT        = so
+  TIFF_LIB	    = -ltiff
 
 endif
 
@@ -93,6 +98,9 @@ ifeq ($(OS),IRIX)
   SO_EXT            = so
   PLUGIN_EXT        = so
 
+  INSTLINKBIN       = install -t -m 755
+  INSTLINKDEV       = install -t -m 644
+
 endif
 
 #### Linux specific definitions
@@ -129,7 +137,7 @@ ifeq ($(OS),FreeBSD)
   SHARED            = -shared
   ARCHARGS          = 
   LINKARGS          = -L/usr/X11R6/lib -L/usr/local/lib -rpath /usr/local/lib
-  DYNAMICLIBRARYLIB = -ldl
+  DYNAMICLIBRARYLIB = 
   OSG_LIBS          = -losgGLUT -losgDB -losgUtil -losg 
   FREETYPE_LIB      = -lfreetype
   GLUT_LIB          = -lglut