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.
24523378 SOLARIS_12_ONLY macro needed for a few gutenprint files
authorJohn Beck <John.Beck@Oracle.COM>
Thu, 25 Aug 2016 12:10:09 -0700
changeset 6694 822f6c7b0f5f
parent 6693 3c64a998e2f5
child 6695 76ba0c79d750
24523378 SOLARIS_12_ONLY macro needed for a few gutenprint files
components/gutenprint/gutenprint.p5m file | annotate | diff | comparison | revisions 
--- a/components/gutenprint/gutenprint.p5m	Thu Aug 25 12:09:50 2016 -0700
+++ b/components/gutenprint/gutenprint.p5m	Thu Aug 25 12:10:09 2016 -0700
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -62,10 +62,10 @@
 file path=usr/include/gutenprint/vars.h
 file path=usr/include/gutenprint/weave.h
 file path=usr/include/gutenprint/xml.h
-file path=usr/include/gutenprintui2/curve.h
-file path=usr/include/gutenprintui2/gammacurve.h
-file path=usr/include/gutenprintui2/gutenprintui.h
-file path=usr/include/gutenprintui2/typebuiltins.h
+$(SOLARIS_12_ONLY)file path=usr/include/gutenprintui2/curve.h
+$(SOLARIS_12_ONLY)file path=usr/include/gutenprintui2/gammacurve.h
+$(SOLARIS_12_ONLY)file path=usr/include/gutenprintui2/gutenprintui.h
+$(SOLARIS_12_ONLY)file path=usr/include/gutenprintui2/typebuiltins.h
 file path=usr/lib/cups/driver/gutenprint.5.2
 file path=usr/lib/cups/filter/commandtocanon
 file path=usr/lib/cups/filter/commandtoepson
@@ -83,11 +83,13 @@
 link path=usr/lib/libgutenprint.so target=libgutenprint.so.2.0.8
 link path=usr/lib/libgutenprint.so.2 target=libgutenprint.so.2.0.8
 file path=usr/lib/libgutenprint.so.2.0.8
-link path=usr/lib/libgutenprintui2.so target=libgutenprintui2.so.1.0.0
-link path=usr/lib/libgutenprintui2.so.1 target=libgutenprintui2.so.1.0.0
-file path=usr/lib/libgutenprintui2.so.1.0.0
+$(SOLARIS_12_ONLY)link path=usr/lib/libgutenprintui2.so \
+    target=libgutenprintui2.so.1.0.0
+$(SOLARIS_12_ONLY)link path=usr/lib/libgutenprintui2.so.1 \
+    target=libgutenprintui2.so.1.0.0
+$(SOLARIS_12_ONLY)file path=usr/lib/libgutenprintui2.so.1.0.0
 file path=usr/lib/pkgconfig/gutenprint.pc
-file path=usr/lib/pkgconfig/gutenprintui2.pc
+$(SOLARIS_12_ONLY)file path=usr/lib/pkgconfig/gutenprintui2.pc
 file path=usr/sbin/cups-genppd.5.2
 file path=usr/sbin/cups-genppdupdate
 file path=usr/share/cups/calibrate.ppm
upstream/oracle/userland-gate