|
Lines 1-23
Link Here
|
| 1 |
--- frmts/ORIG/GNUmakefile Tue Jul 17 09:51:13 2001 |
1 |
--- ogr/GNUmakefile.orig Mon Jun 3 14:54:53 2002 |
| 2 |
+++ frmts/GNUmakefile Mon Aug 27 18:09:37 2001 |
2 |
+++ ogr/GNUmakefile Mon Jun 3 14:55:05 2002 |
| 3 |
@@ -12,7 +12,7 @@ |
3 |
@@ -77,7 +77,7 @@ |
| 4 |
sub-libs: |
|
|
| 5 |
@for dir in $(GDAL_FORMATS) ; do \ |
| 6 |
if test -d $$dir ; then \ |
| 7 |
- if (cd $$dir; $(MAKE) install-obj) ; then \ |
| 8 |
+ if (cd $$dir; $(MAKE) install-obj) || exit 1 ; then \ |
| 9 |
echo; \ |
| 10 |
else \ |
| 11 |
break; \ |
| 12 |
@@ -26,7 +26,7 @@ |
| 13 |
rm -f *.o o/*.o o/*.a |
| 14 |
@for dir in $(GDAL_FORMATS) ; do \ |
| 15 |
if test -d $$dir ; then \ |
| 16 |
- if (cd $$dir; $(MAKE) clean) ; then \ |
| 17 |
+ if (cd $$dir; $(MAKE) clean) || exit 1 ; then \ |
| 18 |
echo; \ |
| 19 |
else \ |
| 20 |
break; \ |
| 21 |
--- ORIG/GDALmake.opt.in Fri Jul 20 00:13:54 2001 |
| 22 |
+++ GDALmake.opt.in Tue Aug 28 16:34:12 2001 |
| 23 |
@@ -67,8 +67,8 @@ |
| 24 |
-- |
|
Lines 25-30
Link Here
|
| 25 |
GDAL_VER = 1.1 |
5 |
docs: |
| 26 |
GDAL_LIB = $(GDAL_ROOT)/gdal.a |
6 |
rm -rf html/* |
| 27 |
-GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(GDAL_VER).$(SO_EXT) |
7 |
- doxygen |
| 28 |
-GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal.$(GDAL_VER) |
8 |
+# doxygen |
| 29 |
+GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT).$(GDAL_VER) |
|
|
| 30 |
+GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal |
| 31 |
-- |
|
Lines 32-33
Link Here
|
| 32 |
OGR_LIB = $(GDAL_ROOT)/ogr/ogr.a |
10 |
|
| 33 |
CPL_LIB = $(GDAL_ROOT)/port/cpl.a |
11 |
$(OGR_LIB): $(OBJ) |
| 34 |
-- |
|
|