[csw-devel] SF.net SVN: gar:[8909] csw/mgar/pkg/x11vnc/trunk/Makefile

[dmichelsen at users.sourceforge.net]

Revision: 8909
          http://gar.svn.sourceforge.net/gar/?rev=8909&view=rev
Author:   dmichelsen
Date:     2010-03-01 10:43:32 +0000 (Mon, 01 Mar 2010)

Log Message:
-----------
x11vnc: Build extra packages for Solaris 10 due to moved X11

Modified Paths:
--------------
    csw/mgar/pkg/x11vnc/trunk/Makefile

Modified: csw/mgar/pkg/x11vnc/trunk/Makefile
===================================================================
--- csw/mgar/pkg/x11vnc/trunk/Makefile	2010-03-01 09:46:49 UTC (rev 8908)
+++ csw/mgar/pkg/x11vnc/trunk/Makefile	2010-03-01 10:43:32 UTC (rev 8909)
@@ -18,13 +18,24 @@
 BUILD_DEP_PKGS = CSWossldevel CSWzlib CSWjpeg
 RUNTIME_DEP_PKGS = CSWosslrt CSWzlib CSWjpeg
 
+PACKAGING_PLATFORMS  = solaris8-sparc solaris8-i386
+PACKAGING_PLATFORMS += solaris10-sparc solaris10-i386
+
 # This is to make sure the X11 path is prepended to the front of lib pathes.
 # Otherwise the wrong X11 gets picked up.
-EXTRA_LIB = /usr/openwin/lib
+EXTRA_LIB_garosrel-5.8  = /usr/openwin/lib
+# We can't add /usr/sfw/lib because then openssl is pickedup from there too.
+#EXTRA_LIB_garosrel-5.10 = /usr/X11/lib /usr/sfw/lib
+EXTRA_LIB_garosrel-5.10 = /usr/X11/lib
+EXTRA_LIB = $(EXTRA_LIB_garosrel-$(GAROSREL))
 
+CONFIGURE_ARGS_garosrel-5.8  = --x-includes=/usr/openwin/include
+CONFIGURE_ARGS_garosrel-5.8 += --x-libraries=/usr/openwin/lib 
+CONFIGURE_ARGS_garosrel-5.10  = --x-includes=/usr/X11/include
+CONFIGURE_ARGS_garosrel-5.10 += --x-libraries=/usr/X11/lib 
+
 CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --x-includes=/usr/openwin/include
-CONFIGURE_ARGS += --x-libraries=/usr/openwin/lib
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_garosrel-$(GAROSREL))
 
 TEST_TARGET = check
 


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