[SCM] gdal branch, master, updated. upstream/1.8.0-18-gbad5afb

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 029c9d5d3c72ee6d99f707c380dd7095306d10f0
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Sat Apr 23 16:30:21 2011 +0200

    Commenting out libtool hack

diff --git a/debian/rules b/debian/rules
index 4d38cf2..5292d29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,17 +93,17 @@ configure-stamp:
 	
 	# Overrides the generated libtool with official one, due to 
 	# breakage in upstream version.
-	cp /usr/bin/libtool $(CURDIR)/libtool
+	#cp /usr/bin/libtool $(CURDIR)/libtool
 	
 	# Patch the generated libtool to avoid passing -rpath when linking,
 	# and to explicitly link libraries against the libraries they
 	# depend on.
-	sed < libtool > libtool-2 \
+	#sed < libtool > libtool-2 \
 	-e 's/^hardcode_libdir_flag_spec.*$$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' \
 	-e '/^archive_cmds="/s/"$$/ \\$$deplibs"/' \
 	-e 's/^hardcode_into_libs.*$$/hardcode_into_libs=no/'
-	mv libtool-2 libtool
-	chmod 755 libtool 
+	#mv libtool-2 libtool
+	#chmod 755 libtool 
 	
 	touch $@
 

-- 
GDAL/OGR library and tools