bug 1316604 - Add variables for <(nss_dist_dir)/{public,private}. r=franziskus
authorTed Mielczarek <ted@mielczarek.org>
Thu, 10 Nov 2016 11:10:00 -0500
changeset 12855 c2b5a69382c4ec47436e5777ca2238c5f0fa8d5d
parent 12854 8aefcb5c55cf30b754f0609236da0e53a7b1fec2
child 12856 6ab200f90a6425ef63ebe8eb3e403c48a6596b97
push id1776
push usertmielczarek@mozilla.com
push dateMon, 14 Nov 2016 15:34:53 +0000
reviewersfranziskus
bugs1316604
bug 1316604 - Add variables for <(nss_dist_dir)/{public,private}. r=franziskus Mozilla's build system currently puts NSS public headers directly in $(DIST)/include/nss, so we need a way to override the export directory.
cmd/lib/exports.gyp
cmd/modutil/modutil.gyp
coreconf/config.gypi
exports.gyp
lib/base/exports.gyp
lib/certdb/exports.gyp
lib/certhigh/exports.gyp
lib/ckfw/builtins/exports.gyp
lib/ckfw/exports.gyp
lib/crmf/exports.gyp
lib/cryptohi/exports.gyp
lib/dbm/include/exports.gyp
lib/dev/exports.gyp
lib/freebl/exports.gyp
lib/jar/exports.gyp
lib/libpkix/include/exports.gyp
lib/libpkix/pkix/certsel/exports.gyp
lib/libpkix/pkix/checker/exports.gyp
lib/libpkix/pkix/crlsel/exports.gyp
lib/libpkix/pkix/params/exports.gyp
lib/libpkix/pkix/results/exports.gyp
lib/libpkix/pkix/store/exports.gyp
lib/libpkix/pkix/top/exports.gyp
lib/libpkix/pkix/util/exports.gyp
lib/libpkix/pkix_pl_nss/module/exports.gyp
lib/libpkix/pkix_pl_nss/pki/exports.gyp
lib/libpkix/pkix_pl_nss/system/exports.gyp
lib/nss/exports.gyp
lib/pk11wrap/exports.gyp
lib/pkcs12/exports.gyp
lib/pkcs7/exports.gyp
lib/pki/exports.gyp
lib/smime/exports.gyp
lib/softoken/exports.gyp
lib/sqlite/exports.gyp
lib/ssl/exports.gyp
lib/util/exports.gyp
lib/zlib/exports.gyp
--- a/cmd/lib/exports.gyp
+++ b/cmd/lib/exports.gyp
@@ -11,17 +11,17 @@
       'type': 'none',
       'copies': [
         {
           'files': [
             'basicutil.h',
             'pk11table.h',
             'secutil.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/cmd/modutil/modutil.gyp
+++ b/cmd/modutil/modutil.gyp
@@ -24,18 +24,18 @@
         '<(DEPTH)/exports.gyp:dbm_exports',
         '<(DEPTH)/lib/jar/jar.gyp:jar',
         '<(DEPTH)/lib/zlib/zlib.gyp:nss_zlib'
       ]
     }
   ],
   'target_defaults': {
     'include_dirs': [
-      '<(nss_dist_dir)/private/nss',
-      '<(nss_dist_dir)/private/dbm'
+      '<(nss_private_dist_dir)/nss',
+      '<(nss_private_dist_dir)/dbm'
     ],
     'defines': [
       'NSPR20',
       'YY_NO_UNPUT',
       'YY_NO_INPUT'
     ]
   },
   'variables': {
--- a/coreconf/config.gypi
+++ b/coreconf/config.gypi
@@ -92,16 +92,18 @@
     'moz_folded_library_name%': '',
     'ssl_enable_zlib%': 1,
     'use_asan%': 0,
     'use_ubsan%': 0,
     'use_sancov%': 0,
     'test_build%': 0,
     'fuzz%': 0,
     'sign_libs%': 1,
+    'nss_public_dist_dir%': '<(nss_dist_dir)/public',
+    'nss_private_dist_dir%': '<(nss_dist_dir)/private',
   },
   'target_defaults': {
     # Settings specific to targets should go here.
     # This is mostly for linking to libraries.
     'variables': {
       'mapfile%': '',
       'test_build%': 0,
     },
--- a/exports.gyp
+++ b/exports.gyp
@@ -6,17 +6,17 @@
     'coreconf/config.gypi'
   ],
   'targets': [
     {
       'target_name': 'nss_exports',
       'type': 'none',
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(nss_dist_dir)/public/nss'
+          '<(nss_public_dist_dir)/nss'
         ]
       },
       'dependencies': [
         'cmd/lib/exports.gyp:cmd_lib_exports',
         'lib/base/exports.gyp:lib_base_exports',
         'lib/certdb/exports.gyp:lib_certdb_exports',
         'lib/certhigh/exports.gyp:lib_certhigh_exports',
         'lib/ckfw/builtins/exports.gyp:lib_ckfw_builtins_exports',
@@ -59,17 +59,17 @@
     },
     {
       'target_name': 'dbm_exports',
       'type': 'none',
       'conditions': [
         ['disable_dbm==0', {
           'direct_dependent_settings': {
             'include_dirs': [
-              '<(nss_dist_dir)/public/dbm'
+              '<(nss_public_dist_dir)/dbm'
             ]
           },
           'dependencies': [
             'lib/dbm/include/exports.gyp:lib_dbm_include_exports'
           ],
         }],
       ],
     }
--- a/lib/base/exports.gyp
+++ b/lib/base/exports.gyp
@@ -10,24 +10,24 @@
       'target_name': 'lib_base_exports',
       'type': 'none',
       'copies': [
         {
           'files': [
             'nssbase.h',
             'nssbaset.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'base.h',
             'baset.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/certdb/exports.gyp
+++ b/lib/certdb/exports.gyp
@@ -11,26 +11,26 @@
       'type': 'none',
       'copies': [
         {
           'files': [
             'cert.h',
             'certdb.h',
             'certt.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'certi.h',
             'certxutl.h',
             'genname.h',
             'xconst.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/certhigh/exports.gyp
+++ b/lib/certhigh/exports.gyp
@@ -10,24 +10,24 @@
       'target_name': 'lib_certhigh_exports',
       'type': 'none',
       'copies': [
         {
           'files': [
             'ocsp.h',
             'ocspt.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'ocspi.h',
             'ocspti.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/ckfw/builtins/exports.gyp
+++ b/lib/ckfw/builtins/exports.gyp
@@ -9,17 +9,17 @@
     {
       'target_name': 'lib_ckfw_builtins_exports',
       'type': 'none',
       'copies': [
         {
           'files': [
             'nssckbi.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/ckfw/exports.gyp
+++ b/lib/ckfw/exports.gyp
@@ -17,28 +17,28 @@
             'nssckft.h',
             'nssckfw.h',
             'nssckfwc.h',
             'nssckfwt.h',
             'nssckg.h',
             'nssckmdt.h',
             'nssckt.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'ck.h',
             'ckfw.h',
             'ckfwm.h',
             'ckfwtm.h',
             'ckmd.h',
             'ckt.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/crmf/exports.gyp
+++ b/lib/crmf/exports.gyp
@@ -12,26 +12,26 @@
       'copies': [
         {
           'files': [
             'cmmf.h',
             'cmmft.h',
             'crmf.h',
             'crmft.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'cmmfi.h',
             'cmmfit.h',
             'crmfi.h',
             'crmfit.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/cryptohi/exports.gyp
+++ b/lib/cryptohi/exports.gyp
@@ -18,20 +18,20 @@
             'cryptohi.h',
             'cryptoht.h',
             'key.h',
             'keyhi.h',
             'keyt.h',
             'keythi.h',
             'sechash.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'keyi.h',
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
 }
--- a/lib/dbm/include/exports.gyp
+++ b/lib/dbm/include/exports.gyp
@@ -11,28 +11,28 @@
       'type': 'none',
       'copies': [
         {
           'files': [
             'mcom_db.h',
             'ncompat.h',
             'winfile.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'extern.h',
             'hash.h',
             'hsearch.h',
             'page.h',
             'queue.h',
             'search.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'dbm'
   }
 }
--- a/lib/dev/exports.gyp
+++ b/lib/dev/exports.gyp
@@ -15,17 +15,17 @@
             'ckhelper.h',
             'dev.h',
             'devm.h',
             'devt.h',
             'devtm.h',
             'nssdev.h',
             'nssdevt.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/freebl/exports.gyp
+++ b/lib/freebl/exports.gyp
@@ -18,31 +18,31 @@
           ],
           'conditions': [
             [ 'OS=="linux"', {
               'files': [
                 'nsslowhash.h',
               ],
             }],
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'alghmac.h',
             'blapi.h',
             'chacha20poly1305.h',
             'ec.h',
             'ecl/ecl-curve.h',
             'ecl/ecl.h',
             'hmacct.h',
             'secmpi.h',
             'secrng.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/jar/exports.gyp
+++ b/lib/jar/exports.gyp
@@ -11,17 +11,17 @@
       'type': 'none',
       'copies': [
         {
           'files': [
             'jar-ds.h',
             'jar.h',
             'jarfile.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/libpkix/include/exports.gyp
+++ b/lib/libpkix/include/exports.gyp
@@ -22,17 +22,17 @@
             'pkix_pl_pki.h',
             'pkix_pl_system.h',
             'pkix_results.h',
             'pkix_revchecker.h',
             'pkix_sample_modules.h',
             'pkix_util.h',
             'pkixt.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/libpkix/pkix/certsel/exports.gyp
+++ b/lib/libpkix/pkix/certsel/exports.gyp
@@ -10,17 +10,17 @@
       'target_name': 'lib_libpkix_pkix_certsel_exports',
       'type': 'none',
       'copies': [
         {
           'files': [
             'pkix_certselector.h',
             'pkix_comcertselparams.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/libpkix/pkix/checker/exports.gyp
+++ b/lib/libpkix/pkix/checker/exports.gyp
@@ -21,17 +21,17 @@
             'pkix_nameconstraintschecker.h',
             'pkix_ocspchecker.h',
             'pkix_policychecker.h',
             'pkix_revocationchecker.h',
             'pkix_revocationmethod.h',
             'pkix_signaturechecker.h',
             'pkix_targetcertchecker.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/libpkix/pkix/crlsel/exports.gyp
+++ b/lib/libpkix/pkix/crlsel/exports.gyp
@@ -10,17 +10,17 @@
       'target_name': 'lib_libpkix_pkix_crlsel_exports',
       'type': 'none',
       'copies': [
         {
           'files': [
             'pkix_comcrlselparams.h',
             'pkix_crlselector.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/libpkix/pkix/params/exports.gyp
+++ b/lib/libpkix/pkix/params/exports.gyp
@@ -12,17 +12,17 @@
       'copies': [
         {
           'files': [
             'pkix_procparams.h',
             'pkix_resourcelimits.h',
             'pkix_trustanchor.h',
             'pkix_valparams.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/libpkix/pkix/results/exports.gyp
+++ b/lib/libpkix/pkix/results/exports.gyp
@@ -12,17 +12,17 @@
       'copies': [
         {
           'files': [
             'pkix_buildresult.h',
             'pkix_policynode.h',
             'pkix_valresult.h',
             'pkix_verifynode.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/libpkix/pkix/store/exports.gyp
+++ b/lib/libpkix/pkix/store/exports.gyp
@@ -9,17 +9,17 @@
     {
       'target_name': 'lib_libpkix_pkix_store_exports',
       'type': 'none',
       'copies': [
         {
           'files': [
             'pkix_store.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/libpkix/pkix/top/exports.gyp
+++ b/lib/libpkix/pkix/top/exports.gyp
@@ -11,17 +11,17 @@
       'type': 'none',
       'copies': [
         {
           'files': [
             'pkix_build.h',
             'pkix_lifecycle.h',
             'pkix_validate.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/libpkix/pkix/util/exports.gyp
+++ b/lib/libpkix/pkix/util/exports.gyp
@@ -12,17 +12,17 @@
       'copies': [
         {
           'files': [
             'pkix_error.h',
             'pkix_list.h',
             'pkix_logger.h',
             'pkix_tools.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/libpkix/pkix_pl_nss/module/exports.gyp
+++ b/lib/libpkix/pkix_pl_nss/module/exports.gyp
@@ -20,17 +20,17 @@
             'pkix_pl_ldapdefaultclient.h',
             'pkix_pl_ldaprequest.h',
             'pkix_pl_ldapresponse.h',
             'pkix_pl_ldapt.h',
             'pkix_pl_nsscontext.h',
             'pkix_pl_pk11certstore.h',
             'pkix_pl_socket.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/libpkix/pkix_pl_nss/pki/exports.gyp
+++ b/lib/libpkix/pkix_pl_nss/pki/exports.gyp
@@ -25,17 +25,17 @@
             'pkix_pl_infoaccess.h',
             'pkix_pl_nameconstraints.h',
             'pkix_pl_ocspcertid.h',
             'pkix_pl_ocsprequest.h',
             'pkix_pl_ocspresponse.h',
             'pkix_pl_publickey.h',
             'pkix_pl_x500name.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/libpkix/pkix_pl_nss/system/exports.gyp
+++ b/lib/libpkix/pkix_pl_nss/system/exports.gyp
@@ -21,17 +21,17 @@
             'pkix_pl_monitorlock.h',
             'pkix_pl_mutex.h',
             'pkix_pl_object.h',
             'pkix_pl_oid.h',
             'pkix_pl_primhash.h',
             'pkix_pl_rwlock.h',
             'pkix_pl_string.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/nss/exports.gyp
+++ b/lib/nss/exports.gyp
@@ -9,24 +9,24 @@
     {
       'target_name': 'lib_nss_exports',
       'type': 'none',
       'copies': [
         {
           'files': [
             'nss.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'nssoptions.h',
             'nssrenam.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/pk11wrap/exports.gyp
+++ b/lib/pk11wrap/exports.gyp
@@ -16,24 +16,24 @@
             'pk11pqg.h',
             'pk11priv.h',
             'pk11pub.h',
             'pk11sdr.h',
             'secmod.h',
             'secmodt.h',
             'secpkcs5.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'dev3hack.h',
             'secmodi.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/pkcs12/exports.gyp
+++ b/lib/pkcs12/exports.gyp
@@ -13,17 +13,17 @@
         {
           'files': [
             'p12.h',
             'p12plcy.h',
             'p12t.h',
             'pkcs12.h',
             'pkcs12t.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/pkcs7/exports.gyp
+++ b/lib/pkcs7/exports.gyp
@@ -11,23 +11,23 @@
       'type': 'none',
       'copies': [
         {
           'files': [
             'pkcs7t.h',
             'secmime.h',
             'secpkcs7.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'p7local.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/pki/exports.gyp
+++ b/lib/pki/exports.gyp
@@ -16,17 +16,17 @@
             'nsspkit.h',
             'pki.h',
             'pki3hack.h',
             'pkim.h',
             'pkistore.h',
             'pkit.h',
             'pkitm.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/smime/exports.gyp
+++ b/lib/smime/exports.gyp
@@ -12,23 +12,23 @@
       'copies': [
         {
           'files': [
             'cms.h',
             'cmsreclist.h',
             'cmst.h',
             'smime.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'cmslocal.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/softoken/exports.gyp
+++ b/lib/softoken/exports.gyp
@@ -10,29 +10,29 @@
       'target_name': 'lib_softoken_exports',
       'type': 'none',
       'copies': [
         {
           'files': [
             'lowkeyi.h',
             'lowkeyti.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'lgglue.h',
             'pkcs11ni.h',
             'sdb.h',
             'sftkdbt.h',
             'softkver.h',
             'softoken.h',
             'softoknt.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/sqlite/exports.gyp
+++ b/lib/sqlite/exports.gyp
@@ -9,17 +9,17 @@
     {
       'target_name': 'lib_sqlite_exports',
       'type': 'none',
       'copies': [
         {
           'files': [
             'sqlite3.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/ssl/exports.gyp
+++ b/lib/ssl/exports.gyp
@@ -13,17 +13,17 @@
         {
           'files': [
             'preenc.h',
             'ssl.h',
             'sslerr.h',
             'sslproto.h',
             'sslt.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/util/exports.gyp
+++ b/lib/util/exports.gyp
@@ -44,24 +44,24 @@
             'secoid.h',
             'secoidt.h',
             'secport.h',
             'utilmodt.h',
             'utilpars.h',
             'utilparst.h',
             'utilrename.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
             'templates.c',
             'verref.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
   ],
   'variables': {
     'module': 'nss'
   }
 }
--- a/lib/zlib/exports.gyp
+++ b/lib/zlib/exports.gyp
@@ -19,15 +19,15 @@
         'target_name': 'lib_zlib_exports',
         'type': 'none',
         'copies': [
           {
           'files': [
             'zlib.h',
             'zconf.h',
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
           }
       ]
     }],
     }],
   ],
 }