Index: trunk/zoo-project/zoo-services/ogr/ogr2ogr/Makefile
===================================================================
--- trunk/zoo-project/zoo-services/ogr/ogr2ogr/Makefile	(revision 303)
+++ trunk/zoo-project/zoo-services/ogr/ogr2ogr/Makefile	(revision 522)
@@ -1,25 +1,13 @@
-GDAL_SRC=./gdal_src/
-
-include $(GDAL_SRC)GDALmake.opt
-
-CPPFLAGS        :=      $(GDAL_INCLUDE) -I$(GDAL_ROOT)/frmts $(CPPFLAGS)
-DEP_LIBS        =       $(EXE_DEP_LIBS) $(XTRAOBJ)
-BIN_LIST = cgi-env/ogr2ogr_service.zo
-
-default:        $(BIN_LIST)
-
-all: default
-
-lib-depend:
-	(cd $(GDAL_SRC)/gcore ; $(MAKE) )
-	(cd $(GDAL_SRC)/port ; $(MAKE) )
-
-CFLAGS=-DZOO_SERVICE -I../../../zoo-kernel/
-
-#cgi-env/ogr2ogr_service.zo: service.c
-#	g++  -DZOO_SERVICE ${CFLAGS} -shared -fpic -o cgi-env/ogr2ogr_service.zo ./service.c -lgdal
+ZRPATH=../../..
+include ${ZRPATH}/zoo-kernel/ZOOMakefile.opts
+CFLAGS=-DZOO_SERVICE ${ZOO_CFLAGS} ${XML2CFLAGS} ${GDAL_CFLAGS} ${PYTHONCFLAGS} -DLINUX_FREE_ISSUE #-DDEBUG
+CC=gcc
 
 cgi-env/ogr2ogr_service.zo: service.c $(DEP_LIBS)
-	g++ $(CFLAGS) $(CPPFLAGS) -shared -fpic $< `gdal-config --libs` -o $@
+	g++ $(CFLAGS) $(CPPFLAGS) -shared -fpic $<  -o $@
+
+install:
+	install -d ${CGI_DIR}/ogr/ogr2ogr
+	install cgi-env/* ${CGI_DIR}/ogr/ogr2ogr
 
 clean: