[csw-devel] SF.net SVN: gar:[17799] csw/mgar/pkg/gdal/trunk/Makefile
bdwalton at users.sourceforge.net
bdwalton at users.sourceforge.net
Sat Apr 21 02:12:26 CEST 2012
Revision: 17799
http://gar.svn.sourceforge.net/gar/?rev=17799&view=rev
Author: bdwalton
Date: 2012-04-21 00:12:25 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
gdal/trunk: only put libdir under gxx, leaving everything else in a normal location
Modified Paths:
--------------
csw/mgar/pkg/gdal/trunk/Makefile
Modified: csw/mgar/pkg/gdal/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gdal/trunk/Makefile 2012-04-20 21:36:32 UTC (rev 17798)
+++ csw/mgar/pkg/gdal/trunk/Makefile 2012-04-21 00:12:25 UTC (rev 17799)
@@ -62,12 +62,12 @@
CATALOGNAME_CSWgdal-dev = gdal_dev
SPKG_DESC_CSWgdal-dev += Geospatial Data Abstraction Library, development files
RUNTIME_DEP_PKGS_CSWgdal-dev += CSWlibgdal1
-PKGFILES_CSWgdal-dev += $(PKGFILES_DEVEL)
+PKGFILES_CSWgdal-dev += $(PKGFILES_DEVEL) /opt/csw/bin/gdal-config
GARCOMPILER = GNU
# c++ libraries, so move things around a bit
-prefix = /opt/csw/gxx
+libdir = $(abspath /opt/csw/gxx/lib/$(MM_LIBDIR))
CONFIGURE_ARGS = $(DIRPATHS)
CONFIGURE_ARGS += --with-libz=$(prefix)
@@ -95,10 +95,3 @@
# to avoid the __sync_fetch_and_add4 issue (must be after including category)
ARCHFLAGS_GCC4_sparcvv8 = -m32
-
-post-merge:
- @( cd $(PKGROOT)/opt/csw; mkdir bin; cd bin; \
- for f in ../gxx/bin/*; do \
- gln -s $$f; \
- done; )
- @$(MAKECOOKIE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list