--- a/components/graphviz/graphviz-ruby.p5m	Wed Apr 29 14:18:37 2015 -0700
+++ b/components/graphviz/graphviz-ruby.p5m	Wed Apr 29 16:36:59 2015 -0700
@@ -33,12 +33,11 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2011/269
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-dir  path=usr/lib/graphviz/ruby
-link path=usr/lib/graphviz/ruby/gv.so target=libgv_ruby.so
-file path=usr/lib/graphviz/ruby/libgv_ruby.so
-link path=usr/ruby/1.8/lib/ruby/vendor_ruby/1.8/$(MACH)-solaris2.11/gv.so \
-    target=../../../../../../../lib/graphviz/ruby/libgv_ruby.so
-dir  path=usr/share/graphviz/demo
+link path=usr/lib/$(MACH64)/graphviz/ruby/gv.so target=libgv_ruby.so
+file path=usr/lib/$(MACH64)/graphviz/ruby/libgv_ruby.so
+link \
+    path=usr/ruby/1.9/lib/ruby/vendor_ruby/1.9.1/$(MACH64)-solaris$(SOLARIS_VERSION)/gv.so \
+    target=../../../../../../../lib/$(MACH64)/graphviz/ruby/libgv_ruby.so
 file path=usr/share/graphviz/demo/modgraph.rb
 file usr/share/man/man3/gv.3ruby path=usr/share/man/man3/gv-ruby.3
 license COPYING license=EPL1.0