From 28732e3451ffb9b4f39e144b958d55d77b87233c Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 12 Feb 2003 14:39:51 +0000
Subject: [PATCH] Merged linkage changes from Duncan Cavens to help the OSG
 osgtext and osghud demo's build cleanly even when a previous version of the
 OSG is installed.

---
 src/Demos/osghud/Makefile  | 4 ++--
 src/Demos/osgtext/Makefile | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Demos/osghud/Makefile b/src/Demos/osghud/Makefile
index d9b02e6a5..a2746fe9d 100644
--- a/src/Demos/osghud/Makefile
+++ b/src/Demos/osghud/Makefile
@@ -4,8 +4,8 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osghud.cpp\
 
-LINKARGS += -L/usr/local/lib
-LIBS     += -losgText $(OSG_LIBS) $(FREETYPE_LIB) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)  
+#LINKARGS += -L/usr/local/lib
+LIBS     += -losgText $(OSG_LIBS) -L/usr/local/lib $(FREETYPE_LIB) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)  
 
 INSTFILES = \
 	$(CXXFILES)\
diff --git a/src/Demos/osgtext/Makefile b/src/Demos/osgtext/Makefile
index 3c74c04a0..2a942b852 100644
--- a/src/Demos/osgtext/Makefile
+++ b/src/Demos/osgtext/Makefile
@@ -4,8 +4,8 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	main.cpp\
 
-LINKARGS += -L/usr/local/lib
-LIBS     += -losgText $(OSG_LIBS) $(FREETYPE_LIB) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)  
+#LINKARGS += -L/usr/local/lib
+LIBS     += -losgText $(OSG_LIBS) -L/usr/local/lib $(FREETYPE_LIB) $(GLUT_LIB) $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS)  
 
 INSTFILES = \
 	$(CXXFILES)\