]>
Commit | Line | Data |
---|---|---|
0316feee JB |
1 | --- gdal-1.11.0/swig/ruby/RubyMakefile.mk.orig 2014-05-11 22:02:00.429131553 +0200 |
2 | +++ gdal-1.11.0/swig/ruby/RubyMakefile.mk 2014-05-12 19:26:05.824192351 +0200 | |
3 | @@ -64,10 +64,10 @@ | |
4 | for i in $(RUBY_MODULES) ; do $(INSTALL) $$i $(DESTDIR)$(INSTALL_DIR) ; done | |
5 | ||
6 | $(RUBY_MODULES_MAC): %.bundle: %_wrap.o | |
7 | - $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@ | |
8 | + $(LD) $(LDFLAGS) $(GDAL_SLIB_LINK) $(LIBS) $(RUBY_LIB) $< -o $@ | |
9 | ||
10 | $(RUBY_MODULES_LIN): %.so: %_wrap.o | |
11 | - $(LD) $(LDFLAGS) $(LIBS) $(GDAL_SLIB_LINK) $(RUBY_LIB) $< -o $@ | |
12 | + $(LD) $(LDFLAGS) $(GDAL_SLIB_LINK) $(LIBS) $(RUBY_LIB) $< -o $@ | |
13 | ||
14 | %.o: %.cpp | |
15 | $(CXX) $(CFLAGS) -fPIC $(GDAL_INCLUDE) $(RUBY_INCLUDE) -c $< | |
16 | --- gdal-1.11.0/GDALmake.opt.in.orig 2014-04-16 22:04:49.000000000 +0200 | |
17 | +++ gdal-1.11.0/GDALmake.opt.in 2014-05-12 19:25:43.287526155 +0200 | |
18 | @@ -100,7 +100,11 @@ | |
19 | ||
20 | GDAL_LIB = $(GDAL_ROOT)/libgdal.a | |
21 | GDAL_SLIB = $(GDAL_ROOT)/libgdal.$(SO_EXT) | |
22 | +ifeq ($(HAVE_LIBTOOL), yes) | |
23 | +GDAL_SLIB_LINK = $(GDAL_ROOT)/libgdal.la | |
24 | +else | |
25 | GDAL_SLIB_LINK = -L$(GDAL_ROOT) -lgdal | |
26 | +endif | |
27 | ||
28 | # Mac OS X Framework definition | |
29 | MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@ |