@@ -39,9 +39,9 @@ LIBEXPAT=libexpat.1.5.0.dylib
39
39
LNKEXPAT=libexpat.1.dylib
40
40
# LIBOPENMODELLER=libopenmodeller.0.0.0.dylib
41
41
# LNKOPENMODELLER=libopenmodeller.0.dylib
42
- LIBPQ=libpq.4.1 .dylib
43
- LNKPQ=libpq.4 .dylib
44
- GRASSLIB=/usr/local/grass-6.2.0 /lib
42
+ LIBPQ=libpq.5.0 .dylib
43
+ LNKPQ=libpq.5 .dylib
44
+ GRASSLIB=/usr/local/grass-6.2.1 /lib
45
45
46
46
# Copy supporting libraries to application bundle
47
47
cd $PREFIX /lib
@@ -204,7 +204,7 @@ install_name_tool -change /usr/local/pgsql/lib/$LNKPQ @executable_path/lib/$LNKP
204
204
# Update library paths to supporting libraries
205
205
install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $PREFIX /lib/libqgis_core.1.0.0.dylib
206
206
install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQLITE3 $PREFIX /lib/libqgis_core.1.0.0.dylib
207
- for LIB in _core.1.0.0 _gui.1.0.0 _raster.0 .0.0 grass.1.0.0
207
+ for LIB in _core.1.0.0 _gui.1.0.0 _raster.1 .0.0 grass.1.0.0
208
208
do
209
209
install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL $PREFIX /lib/libqgis$LIB .dylib
210
210
install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $PREFIX /lib/libqgis$LIB .dylib
@@ -229,12 +229,12 @@ for PLUGIN in \
229
229
grassplugin.so \
230
230
grassprovider.so \
231
231
gridmakerplugin.so \
232
- libScaleBarplugin.so \
233
232
libwfsprovider.so \
234
233
northarrowplugin.so \
235
234
ogrprovider.so \
236
235
pggeoprocessingplugin.so \
237
236
postgresprovider.so \
237
+ scalebarplugin.so \
238
238
spitplugin.so \
239
239
wfsplugin.so \
240
240
wmsprovider.so \
@@ -299,9 +299,10 @@ install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQ
299
299
install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG $HELPPREFIX /qgis_help
300
300
ln -sf $PREFIXBACKTRACK /lib $HELPPREFIX /lib
301
301
302
- # Update msexort application paths to supporting libraries
302
+ # Update msexport application paths to supporting libraries
303
303
install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL $MSEXPORTPREFIX /msexport
304
304
install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $MSEXPORTPREFIX /msexport
305
+ install_name_tool -change /usr/local/lib/$LNKPROJ @executable_path/lib/$LNKPROJ $MSEXPORTPREFIX /msexport
305
306
install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQLITE3 $MSEXPORTPREFIX /msexport
306
307
install_name_tool -change /usr/local/lib/$LNKXERCESC @executable_path/lib/$LNKXERCESC $MSEXPORTPREFIX /msexport
307
308
install_name_tool -change /usr/local/lib/$LNKGIF @executable_path/lib/$LNKGIF $MSEXPORTPREFIX /msexport
@@ -313,6 +314,18 @@ install_name_tool -change /usr/local/lib/$LNKJASPER @executable_path/lib/$LNKJAS
313
314
install_name_tool -change /usr/local/pgsql/lib/$LNKPQ @executable_path/lib/$LNKPQ $MSEXPORTPREFIX /msexport
314
315
ln -sf $PREFIXBACKTRACK /lib $MSEXPORTPREFIX /lib
315
316
317
+ # Update spit application paths to supporting libraries
318
+ # install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL $PREFIX/bin/spit
319
+ # install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $PREFIX/bin/spit
320
+ # install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQLITE3 $PREFIX/bin/spit
321
+ # install_name_tool -change /usr/local/lib/$LNKXERCESC @executable_path/lib/$LNKXERCESC $PREFIX/bin/spit
322
+ # install_name_tool -change /usr/local/lib/$LNKGIF @executable_path/lib/$LNKGIF $PREFIX/bin/spit
323
+ # install_name_tool -change /usr/local/lib/$LNKJPEG @executable_path/lib/$LNKJPEG $PREFIX/bin/spit
324
+ # install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG $PREFIX/bin/spit
325
+ # install_name_tool -change /usr/local/lib/$LNKTIFF @executable_path/lib/$LNKTIFF $PREFIX/bin/spit
326
+ # install_name_tool -change /usr/local/lib/$LNKGEOTIFF @executable_path/lib/$LNKGEOTIFF $PREFIX/bin/spit
327
+ # install_name_tool -change /usr/local/pgsql/lib/$LNKPQ @executable_path/lib/$LNKPQ $PREFIX/bin/spit
328
+
316
329
# Update omgui application paths to supporting libraries
317
330
# install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL $PREFIX/bin/omgui
318
331
# install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $PREFIX/bin/omgui
@@ -324,18 +337,6 @@ ln -sf $PREFIXBACKTRACK/lib $MSEXPORTPREFIX/lib
324
337
# install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG $PREFIX/bin/omgui
325
338
# install_name_tool -change /usr/local/pgsql/lib/$LNKPQ @executable_path/lib/$LNKPQ $PREFIX/bin/omgui
326
339
327
- # Update spit application paths to supporting libraries
328
- install_name_tool -change /usr/local/lib/$LNKGDAL @executable_path/lib/$LNKGDAL $PREFIX /bin/spit
329
- install_name_tool -change /usr/local/lib/$LNKGEOS @executable_path/lib/$LNKGEOS $PREFIX /bin/spit
330
- install_name_tool -change /usr/local/lib/$LNKSQLITE3 @executable_path/lib/$LNKSQLITE3 $PREFIX /bin/spit
331
- install_name_tool -change /usr/local/lib/$LNKXERCESC @executable_path/lib/$LNKXERCESC $PREFIX /bin/spit
332
- install_name_tool -change /usr/local/lib/$LNKGIF @executable_path/lib/$LNKGIF $PREFIX /bin/spit
333
- install_name_tool -change /usr/local/lib/$LNKJPEG @executable_path/lib/$LNKJPEG $PREFIX /bin/spit
334
- install_name_tool -change /usr/local/lib/$LNKPNG @executable_path/lib/$LNKPNG $PREFIX /bin/spit
335
- install_name_tool -change /usr/local/lib/$LNKTIFF @executable_path/lib/$LNKTIFF $PREFIX /bin/spit
336
- install_name_tool -change /usr/local/lib/$LNKGEOTIFF @executable_path/lib/$LNKGEOTIFF $PREFIX /bin/spit
337
- install_name_tool -change /usr/local/pgsql/lib/$LNKPQ @executable_path/lib/$LNKPQ $PREFIX /bin/spit
338
-
339
340
# # Copy openModeller config file for path to non-standard library location
340
341
# if test ! -f $PREFIX/om_config; then
341
342
# cp mac_build/om_config $PREFIX/om_config
0 commit comments