Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7080229 bison should not install files under /usr/sfw
authorRich Burridge <rich.burridge@oracle.com>
Fri, 19 Aug 2011 14:00:26 -0700
changeset 486 00cc0158aa99
parent 485 9b12cda204fe
child 487 4e721bcfa7d1
7080229 bison should not install files under /usr/sfw
components/bison/Makefile file | annotate | diff | comparison | revisions
components/bison/bison-runtime.p5m file | annotate | diff | comparison | revisions
components/ghostscript/ghostscript.p5m file | annotate | diff | comparison | revisions
components/imagemagick/imagemagick.p5m file | annotate | diff | comparison | revisions
make-rules/shared-macros.mk file | annotate | diff | comparison | revisions 
--- a/components/bison/Makefile	Fri Aug 19 12:10:01 2011 -0700
+++ b/components/bison/Makefile	Fri Aug 19 14:00:26 2011 -0700
@@ -36,8 +36,8 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-CONFIGURE_LIBDIR.32 =   $(SFWLIB)
-CONFIGURE_LIBDIR.64 =   $(SFWLIB)/$(MACH64)
+CONFIGURE_LIBDIR.32 =   $(GNULIB)
+CONFIGURE_LIBDIR.64 =   $(GNULIB)/$(MACH64)
 
 CONFIGURE_OPTIONS  +=		--infodir=$(CONFIGURE_INFODIR)
 CONFIGURE_OPTIONS  +=		CFLAGS="$(CFLAGS)"
--- a/components/bison/bison-runtime.p5m	Fri Aug 19 12:10:01 2011 -0700
+++ b/components/bison/bison-runtime.p5m	Fri Aug 19 14:00:26 2011 -0700
@@ -88,8 +88,8 @@
 dir path=usr/share/locale/vi/LC_MESSAGES
 dir path=usr/share/locale/zh_TW
 dir path=usr/share/locale/zh_TW/LC_MESSAGES
-file path=usr/sfw/lib/$(MACH64)/liby.so.1
-file path=usr/sfw/lib/liby.so.1
+file path=usr/gnu/lib/$(MACH64)/liby.so.1
+file path=usr/gnu/lib/liby.so.1
 file path=usr/share/locale/da/LC_MESSAGES/bison-runtime.mo
 file path=usr/share/locale/de/LC_MESSAGES/bison-runtime.mo
 file path=usr/share/locale/es/LC_MESSAGES/bison-runtime.mo
@@ -114,5 +114,11 @@
 file path=usr/share/locale/vi/LC_MESSAGES/bison-runtime.mo
 file path=usr/share/locale/zh_TW/LC_MESSAGES/bison-runtime.mo
 license bison.license license=GPLv2
-link path=usr/sfw/lib/$(MACH64)/liby.so target=liby.so.1
-link path=usr/sfw/lib/liby.so target=liby.so.1
+link path=usr/gnu/lib/$(MACH64)/liby.so target=liby.so.1
+link path=usr/gnu/lib/liby.so target=liby.so.1
+link path=usr/sfw/lib/$(MACH64)/liby.so.1 \
+    target=../../../gnu/lib/$(MACH64)/liby.so.1
+link path=usr/sfw/lib/liby.so.1 target=../../gnu/lib/liby.so.1
+link path=usr/sfw/lib/$(MACH64)/liby.so \
+    target=../../../gnu/lib/$(MACH64)/liby.so.1
+link path=usr/sfw/lib/liby.so target=../../gnu/lib/liby.so.1
--- a/components/ghostscript/ghostscript.p5m	Fri Aug 19 12:10:01 2011 -0700
+++ b/components/ghostscript/ghostscript.p5m	Fri Aug 19 14:00:26 2011 -0700
@@ -44,6 +44,8 @@
 dir path=usr/lib/cups
 dir path=usr/lib/cups/filter
 dir path=usr/lib/pkgconfig
+dir path=usr/sfw
+dir path=usr/sfw/bin
 dir path=usr/share
 dir path=usr/share/cups
 dir path=usr/share/cups/model
--- a/components/imagemagick/imagemagick.p5m	Fri Aug 19 12:10:01 2011 -0700
+++ b/components/imagemagick/imagemagick.p5m	Fri Aug 19 14:00:26 2011 -0700
@@ -67,6 +67,8 @@
 dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto
 dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image
 dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick
+dir path=usr/sfw
+dir path=usr/sfw/bin
 dir path=usr/share
 dir path=usr/share/ImageMagick-$(COMPONENT_VERSION)
 dir path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config
--- a/make-rules/shared-macros.mk	Fri Aug 19 12:10:01 2011 -0700
+++ b/make-rules/shared-macros.mk	Fri Aug 19 14:00:26 2011 -0700
@@ -207,6 +207,8 @@
 PROTOSFWINCLUDE =	$(PROTO_DIR)/$(SFWINCLUDE)
 
 GNUBIN =	/usr/gnu/bin
+GNULIB =	/usr/gnu/lib
+GNULIB64 =	/usr/gnu/lib/$(MACH64)
 GNUSHARE =	/usr/gnu/share
 GNUSHAREMAN =	/usr/gnu/share/man
 GNUSHAREMAN1 =	/usr/gnu/share/man/man1
upstream/oracle/userland-gate