22619740 opensp should be 64-bit
authorRich Burridge <rich.burridge@oracle.com>
Thu, 28 Jan 2016 16:59:30 -0800
changeset 5366 6eaed9347ba1
parent 5365 447b67338e7f
child 5367 4873f28a0784
22619740 opensp should be 64-bit
components/opensp/Makefile
components/opensp/opensp.p5m
--- a/components/opensp/Makefile	Thu Jan 28 16:57:12 2016 -0800
+++ b/components/opensp/Makefile	Thu Jan 28 16:59:30 2016 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -48,6 +48,7 @@
 
 CXX +=			$(studio_NORUNPATH)
 
+CONFIGURE_OPTIONS +=	--bindir=/usr/bin
 CONFIGURE_OPTIONS +=	--disable-http
 CONFIGURE_OPTIONS +=	--disable-nls
 CONFIGURE_OPTIONS +=	--enable-default-catalog="CATALOG:/etc/sgml/catalog:/usr/share/sgml/CATALOG"
--- a/components/opensp/opensp.p5m	Thu Jan 28 16:57:12 2016 -0800
+++ b/components/opensp/opensp.p5m	Thu Jan 28 16:59:30 2016 -0800
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -36,20 +36,6 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=LSARC/2005/734
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-link path=usr/bin/$(MACH64)/nsgmls target=onsgmls
-file path=usr/bin/$(MACH64)/onsgmls
-link path=usr/bin/$(MACH64)/osgml2xml target=osx
-file path=usr/bin/$(MACH64)/osgmlnorm
-file path=usr/bin/$(MACH64)/ospam
-file path=usr/bin/$(MACH64)/ospcat
-file path=usr/bin/$(MACH64)/ospent
-file path=usr/bin/$(MACH64)/osx
-link path=usr/bin/$(MACH64)/s2x target=osx
-link path=usr/bin/$(MACH64)/sgml2xml target=osx
-link path=usr/bin/$(MACH64)/sgmlnorm target=osgmlnorm
-link path=usr/bin/$(MACH64)/spam target=ospam
-link path=usr/bin/$(MACH64)/spcat target=ospcat
-link path=usr/bin/$(MACH64)/spent target=ospent
 link path=usr/bin/nsgmls target=onsgmls
 file path=usr/bin/onsgmls
 link path=usr/bin/osgml2xml target=osx