[SCM] gdal branch, master, updated. upstream/1.8.1-93-g6735e3e

[Alan Boudreault]

The following commit has been merged in the master branch:
commit ccaa9f0fa871c66775e105d232d6c4e3339ad8c3
Author: Alan Boudreault <aboudreault at mapgears.com>
Date:   Wed Feb 1 03:50:27 2012 +0000

    minor change in rubymakefile patch

diff --git a/debian/patches/rubymakefile b/debian/patches/rubymakefile
index 6d5d449..9c215a4 100644
--- a/debian/patches/rubymakefile
+++ b/debian/patches/rubymakefile
@@ -1,16 +1,16 @@
 --- a/swig/ruby/RubyMakefile.mk
 +++ b/swig/ruby/RubyMakefile.mk
-@@ -37,7 +37,9 @@
- 
- ifeq ("$(shell uname -s)", "Darwin")
- RUBY_MODULES=$(RUBY_MODULES_MAC)
--LDFLAGS += -Xcompiler -bundle -L$(RUBY_LIB_DIR)
-+LDFLAGS += -fPIC -DPIC -Xcompiler -bundle -L$(RUBY_LIB_DIR)
-+CFLAGS += -fPIC -DPIC
-+CXXFLAGS += -fPIC -DPIC
+@@ -41,7 +41,9 @@
  RUBY_LIB := -l$(RUBY_SO_NAME)
  else
  RUBY_MODULES=$(RUBY_MODULES_LIN)
+-LDFLAGS += -Xcompiler -shared -L$(RUBY_LIB_DIR)
++LDFLAGS += -fPIC -DPIC -Xcompiler -L$(RUBY_LIB_DIR)
++CFLAGS += -fPIC -DPIC
++CXXFLAGS += -fPIC -DPIC
+ RUBY_LIB := -l$(RUBY_SO_NAME)
+ endif
+ 
 @@ -59,7 +61,7 @@
  $(INSTALL_DIR):
  	mkdir -p $(DESTDIR)$(INSTALL_DIR)

-- 
GDAL/OGR library and tools