Remove python-24 dependency from antlr2 oi_151a
authorJon Tibble <meths@btinternet.com>
Sat, 12 May 2012 14:07:11 +0100
branchoi_151a
changeset 139 497ebb11b6c0
parent 138 acb1a177bb6d
child 140 98dea9cbcdbc
Remove python-24 dependency from antlr2
usr/src/lib/antlr2/Makefile.sfw
usr/src/pkgdefs/SUNWantlr2/depend
--- a/usr/src/lib/antlr2/Makefile.sfw	Sat May 12 14:03:19 2012 +0100
+++ b/usr/src/lib/antlr2/Makefile.sfw	Sat May 12 14:07:11 2012 +0100
@@ -20,10 +20,9 @@
 #
  
 #
-# Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
 #
-# ident	"@(#)Makefile.sfw	1.4	10/01/08 SMI"
+# ident	"@(#)Makefile.sfw	1.5	10/11/01 SMI"
 #
 
 include ../Makefile.lib
@@ -36,7 +35,8 @@
 
 install: all
 	(cd $(VER); env - INSTALL="$(INSTALL_PROTO)" DESTDIR=$(ROOT) \
-			MAKE=$(GMAKE) $(GMAKE) -e install)
+	    PYTHON=$(PYTHON26) \
+	    MAKE=$(GMAKE) $(GMAKE) -e install)
 	$(SHELL) ./install-sfw
 
 $(VER)/config.status: $(VER)/configure
@@ -44,7 +44,7 @@
 	  PATH=$(SFW_PATH) \
 	  MAKE=$(GMAKE) \
 	  CC="$(CC)" CXX="$(CCC)" \
-	  PYTHON=$(PYTHON24) \
+	  PYTHON=$(PYTHON26) \
 	  CXXLINK="$(CCC)" \
 	  LDFLAGS="-lCstd -lCrun -lm -lc" \
 	  ./configure $(CONFIGURE_OPTIONS) )
--- a/usr/src/pkgdefs/SUNWantlr2/depend	Sat May 12 14:03:19 2012 +0100
+++ b/usr/src/pkgdefs/SUNWantlr2/depend	Sat May 12 14:07:11 2012 +0100
@@ -1,6 +1,3 @@
-#
-# Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
-# Use is subject to license terms.
 #
 # CDDL HEADER START
 #
@@ -21,7 +18,9 @@
 #
 # CDDL HEADER END
 #
-#ident	"@(#)depend	1.1	09/06/15 SMI"
+# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+#
+#ident	"@(#)depend	1.2	10/11/01 SMI"
 #
 # This package information file defines software dependencies associated
 # with the pkg.  You can define three types of pkg dependencies with this file:
@@ -49,4 +48,4 @@
 P SUNWcsu	Core Solaris, (Usr)
 P SUNWcsd	Core Solaris Devices
 P SUNWcsl	Core Solaris Libraries
-P SUNWPython	The Python interpreter, libraries and utilities
+P SUNWPython26	The Python interpreter, libraries and utilities