Index: gdal-1.8.0/GDALmake.opt.in
===================================================================
--- gdal-1.8.0.orig/GDALmake.opt.in	2011-05-09 22:28:44.000000000 -0400
+++ gdal-1.8.0/GDALmake.opt.in	2011-05-09 22:29:20.000000000 -0400
@@ -92,7 +92,7 @@
 			-I$(GDAL_ROOT)/ogr -I$(GDAL_ROOT)/ogr/ogrsf_frmts
 
 # libtool targets and help variables
-LIBGDAL	:=		libgdal.la
+LIBGDAL	:=		libgdal1.8.0.la
 LIBGDAL_CURRENT	:=	16
 LIBGDAL_REVISION	:=	0
 LIBGDAL_AGE	:=	15
@@ -105,9 +105,9 @@
 GDAL_VERSION_MINOR =    @GDAL_VERSION_MINOR@
 GDAL_VERSION_REV   =    @GDAL_VERSION_REV@
 
-GDAL_LIB	= 	$(GDAL_ROOT)/libgdal.a
-GDAL_SLIB	=	$(GDAL_ROOT)/libgdal.$(SO_EXT)
-GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal
+GDAL_LIB	= 	$(GDAL_ROOT)/libgdal1.8.0.a
+GDAL_SLIB	=	$(GDAL_ROOT)/libgdal1.8.0.$(SO_EXT)
+GDAL_SLIB_LINK	=	-L$(GDAL_ROOT) -lgdal1.8.0
 
 # Mac OS X Framework definition
 MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
@@ -330,7 +330,7 @@
 # PCRaster support
 PCRASTER_SETTING	=	@PCRASTER_SETTING@
 
-OGDI_INCLUDE	=	-I/usr/include/ogdi
+OGDI_INCLUDE	=	@OGDI_INCLUDE@
 
 PNG_SETTING     =	@PNG_SETTING@
 JPEG_SETTING	=	@JPEG_SETTING@
@@ -433,9 +433,9 @@
 
 CONFIG_LIBS	=	$(GDAL_ROOT)/$(LIBGDAL)
 ifeq ($(MACOSX_FRAMEWORK),yes)
-CONFIG_LIBS_INS	=	-L$(INST_LIB)/unix/lib -lgdal
+CONFIG_LIBS_INS	=	-L$(INST_LIB)/unix/lib -lgdal1.8.0
 else
-CONFIG_LIBS_INS	=	-L$(INST_LIB) -lgdal
+CONFIG_LIBS_INS	=	-L$(INST_LIB) -lgdal1.8.0
 endif # MACOSX_FRAMEWORK
 
 EXE_DEP_LIBS	=	$(GDAL_ROOT)/$(LIBGDAL)
@@ -446,9 +446,9 @@
 ifeq ($(HAVE_LD_SHARED),yes)
 CONFIG_LIBS	=	$(GDAL_SLIB_LINK) $(LIBS)
 ifeq ($(MACOSX_FRAMEWORK),yes)
-CONFIG_LIBS_INS	=	-L$(INST_LIB)/unix/lib -lgdal
+CONFIG_LIBS_INS	=	-L$(INST_LIB)/unix/lib -lgdal1.8.0
 else
-CONFIG_LIBS_INS	=	-L$(INST_LIB) -lgdal
+CONFIG_LIBS_INS	=	-L$(INST_LIB) -lgdal1.8.0
 endif
 EXE_DEP_LIBS	=	$(GDAL_SLIB)
 else
Index: gdal-1.8.0/swig/perl/Makefile.PL
===================================================================
--- gdal-1.8.0.orig/swig/perl/Makefile.PL	2011-05-09 22:28:44.000000000 -0400
+++ gdal-1.8.0/swig/perl/Makefile.PL	2011-05-09 22:28:52.000000000 -0400
@@ -24,7 +24,7 @@
     die "can't find gdal-config";
 }
 open $fh, $fh or die "$fh not found!";
-$LIB .= " -lgdal ";
+$LIB .= " -lgdal1.8.0 ";
 if ($fh) {
     @config = <$fh>;
     close $fh;