From cb31021ab0b7bc32a69ec7d5507db3ba105a75a4 Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Wed, 28 Jul 2004 12:29:15 +0000
Subject: [PATCH] From Corbin Holtz, addition of GDAL_INCLUDE and GDAL_LIB env
 vars for setting a non standard location of GDAL

---
 examples/osgdem/GNUmakefile      | 8 ++++++++
 examples/osgdem/GNUmakefile.inst | 8 ++++++++
 src/osgPlugins/gdal/GNUmakefile  | 8 ++++++++
 src/osgTerrain/GNUmakefile       | 7 +++++++
 4 files changed, 31 insertions(+)

diff --git a/examples/osgdem/GNUmakefile b/examples/osgdem/GNUmakefile
index 52b9a49bb..e500dc058 100644
--- a/examples/osgdem/GNUmakefile
+++ b/examples/osgdem/GNUmakefile
@@ -4,6 +4,14 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osgdem.cpp\
 
+ifneq ("$(GDAL_INCLUDES)","")
+INC += $(GDAL_INCLUDES)
+endif
+
+ifneq ("$(GDAL_LIB_DIR)","")
+LDFLAGS += -L$(GDAL_LIB_DIR)
+endif
+
 LIBS     += -losgProducer -lProducer -losgTerrain -losgFX -losgGL2 -losgText -losgGA -losgDB -losgUtil -losg -lgdal $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
 
 INSTFILES = \
diff --git a/examples/osgdem/GNUmakefile.inst b/examples/osgdem/GNUmakefile.inst
index 1d6d959af..56ef37b1f 100644
--- a/examples/osgdem/GNUmakefile.inst
+++ b/examples/osgdem/GNUmakefile.inst
@@ -4,6 +4,14 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
 	osgdem.cpp\
 
+ifneq ("$(GDAL_INCLUDES)","")
+INC += $(GDAL_INCLUDES)
+endif
+
+ifneq ("$(GDAL_LIB_DIR)","")
+LDFLAGS += -L$(GDAL_LIB_DIR)
+endif
+
 LIBS     += -losgProducer -lProducer -losgTerrain -losgFX -losgGL2 -losgDB -losgText -losgUtil -losg $(GL_LIBS) $(X_LIBS) $(OTHER_LIBS) 
 
 EXEC = osgdem
diff --git a/src/osgPlugins/gdal/GNUmakefile b/src/osgPlugins/gdal/GNUmakefile
index 0fb81e830..f4ebec271 100644
--- a/src/osgPlugins/gdal/GNUmakefile
+++ b/src/osgPlugins/gdal/GNUmakefile
@@ -4,6 +4,14 @@ include $(TOPDIR)/Make/makedefs
 CXXFILES =\
         ReaderWriterGDAL.cpp\
 
+ifneq ("$(GDAL_INCLUDES)","")
+INC += $(GDAL_INCLUDES)
+endif
+
+ifneq ("$(GDAL_LIB_DIR)","")
+LDFLAGS += -L$(GDAL_LIB_DIR)
+endif
+
 LIBS  += $(OSG_LIBS) -lgdal $(OTHER_LIBS)
 
 TARGET_BASENAME = gdal
diff --git a/src/osgTerrain/GNUmakefile b/src/osgTerrain/GNUmakefile
index 3048d3a7f..d70e63c94 100644
--- a/src/osgTerrain/GNUmakefile
+++ b/src/osgTerrain/GNUmakefile
@@ -8,6 +8,13 @@ CXXFILES = \
     HeightFieldRenderer.cpp\
     Version.cpp\
 
+ifneq ("$(GDAL_INCLUDES)","")
+INC += $(GDAL_INCLUDES)
+endif
+
+ifneq ("$(GDAL_LIB_DIR)","")
+LDFLAGS += -L$(GDAL_LIB_DIR)
+endif
 
 DEF     += -DOSGTERRAIN_LIBRARY