[csw-devel] SF.net SVN: gar:[15800] csw/mgar/pkg/libnet/branches/1.1.x/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 15800
          http://gar.svn.sourceforge.net/gar/?rev=15800&view=rev
Author:   dmichelsen
Date:     2011-09-29 09:52:04 +0000 (Thu, 29 Sep 2011)
Log Message:
-----------
libnet: Fix library search path

Modified Paths:
--------------
    csw/mgar/pkg/libnet/branches/1.1.x/Makefile

Modified: csw/mgar/pkg/libnet/branches/1.1.x/Makefile
===================================================================
--- csw/mgar/pkg/libnet/branches/1.1.x/Makefile	2011-09-28 21:57:46 UTC (rev 15799)
+++ csw/mgar/pkg/libnet/branches/1.1.x/Makefile	2011-09-29 09:52:04 UTC (rev 15800)
@@ -36,7 +36,6 @@
 # stay the way it is.
 CHECKPKG_OVERRIDES_CSWlibnet += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libnet.so
 CHECKPKG_OVERRIDES_CSWlibnet += bad-rpath-entry
-# CHECKPKG_OVERRIDES_CSWlibnet += bad-rpath-entry|$ORIGIN/../lib|opt/csw/lib/libnet.so.1.0.2
 CHECKPKG_OVERRIDES_CSWlibnet += shared-lib-pkgname-mismatch|file=opt/csw/lib/libnet.so.1.0.2|soname=libnet.so.1.0.2|pkgname=CSWlibnet|expected=CSWlibnet1-0-2
 CHECKPKG_OVERRIDES_CSWlibnet += shared-lib-package-contains-so-symlink|file=/opt/csw/lib/libnet.so
 
@@ -57,6 +56,10 @@
 
 BUILD64 = 1
 
+EXTRA_CONFIGURE_ARGS-32 += LIBNET_CONFIG_LIBS=-L$(libdir)/libnet-new
+EXTRA_CONFIGURE_ARGS-64 += LIBNET_CONFIG_LIBS=-L$(libdir)
+EXTRA_CONFIGURE_ARGS += $(EXTRA_CONFIGURE_ARGS-$(MEMORYMODEL))
+
 include gar/category.mk
 
 post-install-isa-sparcv8:

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.