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.

38 files changed, 55 insertions, 53 deletions

diff --git a/cmd/lib/exports.gyp b/cmd/lib/exports.gyp
index dfb8c7449..f6b469397 100644
--- a/cmd/lib/exports.gyp
+++ b/cmd/lib/exports.gyp
@@ -16,7 +16,7 @@
             'pk11table.h',
             'secutil.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/cmd/modutil/modutil.gyp b/cmd/modutil/modutil.gyp
index e928f51c1..5d0f87a65 100644
--- a/cmd/modutil/modutil.gyp
+++ b/cmd/modutil/modutil.gyp
@@ -29,8 +29,8 @@
   ],
   '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',
diff --git a/coreconf/config.gypi b/coreconf/config.gypi
index f8c979dbe..99e61ec77 100644
--- a/coreconf/config.gypi
+++ b/coreconf/config.gypi
@@ -97,6 +97,8 @@
     '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.
diff --git a/exports.gyp b/exports.gyp
index c4156f8ce..907b5ac88 100644
--- a/exports.gyp
+++ b/exports.gyp
@@ -11,7 +11,7 @@
       'type': 'none',
       'direct_dependent_settings': {
         'include_dirs': [
-          '<(nss_dist_dir)/public/nss'
+          '<(nss_public_dist_dir)/nss'
         ]
       },
       'dependencies': [
@@ -64,7 +64,7 @@
         ['disable_dbm==0', {
           'direct_dependent_settings': {
             'include_dirs': [
-              '<(nss_dist_dir)/public/dbm'
+              '<(nss_public_dist_dir)/dbm'
             ]
           },
           'dependencies': [
diff --git a/lib/base/exports.gyp b/lib/base/exports.gyp
index 1ab28106f..394bc1dea 100644
--- a/lib/base/exports.gyp
+++ b/lib/base/exports.gyp
@@ -15,14 +15,14 @@
             '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)'
         }
       ]
     }
diff --git a/lib/certdb/exports.gyp b/lib/certdb/exports.gyp
index 348c62997..359c93041 100644
--- a/lib/certdb/exports.gyp
+++ b/lib/certdb/exports.gyp
@@ -16,7 +16,7 @@
             'certdb.h',
             'certt.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
@@ -25,7 +25,7 @@
             'genname.h',
             'xconst.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/certhigh/exports.gyp b/lib/certhigh/exports.gyp
index 5c46f7176..b8e2f3ebc 100644
--- a/lib/certhigh/exports.gyp
+++ b/lib/certhigh/exports.gyp
@@ -15,14 +15,14 @@
             '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)'
         }
       ]
     }
diff --git a/lib/ckfw/builtins/exports.gyp b/lib/ckfw/builtins/exports.gyp
index 8d84c09dc..6a5c38fb8 100644
--- a/lib/ckfw/builtins/exports.gyp
+++ b/lib/ckfw/builtins/exports.gyp
@@ -14,7 +14,7 @@
           'files': [
             'nssckbi.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/ckfw/exports.gyp b/lib/ckfw/exports.gyp
index 6f2b7a4bc..b986fd807 100644
--- a/lib/ckfw/exports.gyp
+++ b/lib/ckfw/exports.gyp
@@ -22,7 +22,7 @@
             'nssckmdt.h',
             'nssckt.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
@@ -33,7 +33,7 @@
             'ckmd.h',
             'ckt.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/crmf/exports.gyp b/lib/crmf/exports.gyp
index 7ae9c0ea0..fca009756 100644
--- a/lib/crmf/exports.gyp
+++ b/lib/crmf/exports.gyp
@@ -17,7 +17,7 @@
             'crmf.h',
             'crmft.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
@@ -26,7 +26,7 @@
             'crmfi.h',
             'crmfit.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/cryptohi/exports.gyp b/lib/cryptohi/exports.gyp
index bc96eb2fd..bb910592c 100644
--- a/lib/cryptohi/exports.gyp
+++ b/lib/cryptohi/exports.gyp
@@ -23,13 +23,13 @@
             '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)'
         }
       ]
     }
diff --git a/lib/dbm/include/exports.gyp b/lib/dbm/include/exports.gyp
index 63859fbec..e80d769ca 100644
--- a/lib/dbm/include/exports.gyp
+++ b/lib/dbm/include/exports.gyp
@@ -16,7 +16,7 @@
             'ncompat.h',
             'winfile.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
@@ -27,7 +27,7 @@
             'queue.h',
             'search.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/dev/exports.gyp b/lib/dev/exports.gyp
index e3ca26783..92cf7564b 100644
--- a/lib/dev/exports.gyp
+++ b/lib/dev/exports.gyp
@@ -20,7 +20,7 @@
             'nssdev.h',
             'nssdevt.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/freebl/exports.gyp b/lib/freebl/exports.gyp
index e397c0e3e..ef81685b0 100644
--- a/lib/freebl/exports.gyp
+++ b/lib/freebl/exports.gyp
@@ -23,7 +23,7 @@
               ],
             }],
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
@@ -37,7 +37,7 @@
             'secmpi.h',
             'secrng.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/jar/exports.gyp b/lib/jar/exports.gyp
index 329da46ea..94ee144e8 100644
--- a/lib/jar/exports.gyp
+++ b/lib/jar/exports.gyp
@@ -16,7 +16,7 @@
             'jar.h',
             'jarfile.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/libpkix/include/exports.gyp b/lib/libpkix/include/exports.gyp
index 58f1544fc..92baaaa9d 100644
--- a/lib/libpkix/include/exports.gyp
+++ b/lib/libpkix/include/exports.gyp
@@ -27,7 +27,7 @@
             'pkix_util.h',
             'pkixt.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/libpkix/pkix/certsel/exports.gyp b/lib/libpkix/pkix/certsel/exports.gyp
index 8e0374aa3..9cbd847e7 100644
--- a/lib/libpkix/pkix/certsel/exports.gyp
+++ b/lib/libpkix/pkix/certsel/exports.gyp
@@ -15,7 +15,7 @@
             'pkix_certselector.h',
             'pkix_comcertselparams.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/libpkix/pkix/checker/exports.gyp b/lib/libpkix/pkix/checker/exports.gyp
index 993eaef42..4bd68b39c 100644
--- a/lib/libpkix/pkix/checker/exports.gyp
+++ b/lib/libpkix/pkix/checker/exports.gyp
@@ -26,7 +26,7 @@
             'pkix_signaturechecker.h',
             'pkix_targetcertchecker.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/libpkix/pkix/crlsel/exports.gyp b/lib/libpkix/pkix/crlsel/exports.gyp
index b80dfc2e4..a7001ffed 100644
--- a/lib/libpkix/pkix/crlsel/exports.gyp
+++ b/lib/libpkix/pkix/crlsel/exports.gyp
@@ -15,7 +15,7 @@
             'pkix_comcrlselparams.h',
             'pkix_crlselector.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/libpkix/pkix/params/exports.gyp b/lib/libpkix/pkix/params/exports.gyp
index 3131ed008..921f2ceae 100644
--- a/lib/libpkix/pkix/params/exports.gyp
+++ b/lib/libpkix/pkix/params/exports.gyp
@@ -17,7 +17,7 @@
             'pkix_trustanchor.h',
             'pkix_valparams.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/libpkix/pkix/results/exports.gyp b/lib/libpkix/pkix/results/exports.gyp
index 7379a5d7f..dfff68903 100644
--- a/lib/libpkix/pkix/results/exports.gyp
+++ b/lib/libpkix/pkix/results/exports.gyp
@@ -17,7 +17,7 @@
             'pkix_valresult.h',
             'pkix_verifynode.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/libpkix/pkix/store/exports.gyp b/lib/libpkix/pkix/store/exports.gyp
index 3f6cb4798..52f13f5ae 100644
--- a/lib/libpkix/pkix/store/exports.gyp
+++ b/lib/libpkix/pkix/store/exports.gyp
@@ -14,7 +14,7 @@
           'files': [
             'pkix_store.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/libpkix/pkix/top/exports.gyp b/lib/libpkix/pkix/top/exports.gyp
index bc66ccc68..d41f2b5ec 100644
--- a/lib/libpkix/pkix/top/exports.gyp
+++ b/lib/libpkix/pkix/top/exports.gyp
@@ -16,7 +16,7 @@
             'pkix_lifecycle.h',
             'pkix_validate.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/libpkix/pkix/util/exports.gyp b/lib/libpkix/pkix/util/exports.gyp
index d0bf573aa..8318c6c34 100644
--- a/lib/libpkix/pkix/util/exports.gyp
+++ b/lib/libpkix/pkix/util/exports.gyp
@@ -17,7 +17,7 @@
             'pkix_logger.h',
             'pkix_tools.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/libpkix/pkix_pl_nss/module/exports.gyp b/lib/libpkix/pkix_pl_nss/module/exports.gyp
index 41fe3e297..064a17ce4 100644
--- a/lib/libpkix/pkix_pl_nss/module/exports.gyp
+++ b/lib/libpkix/pkix_pl_nss/module/exports.gyp
@@ -25,7 +25,7 @@
             'pkix_pl_pk11certstore.h',
             'pkix_pl_socket.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/libpkix/pkix_pl_nss/pki/exports.gyp b/lib/libpkix/pkix_pl_nss/pki/exports.gyp
index 89d4e012e..616f94fd4 100644
--- a/lib/libpkix/pkix_pl_nss/pki/exports.gyp
+++ b/lib/libpkix/pkix_pl_nss/pki/exports.gyp
@@ -30,7 +30,7 @@
             'pkix_pl_publickey.h',
             'pkix_pl_x500name.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/libpkix/pkix_pl_nss/system/exports.gyp b/lib/libpkix/pkix_pl_nss/system/exports.gyp
index d90e27609..a2f759441 100644
--- a/lib/libpkix/pkix_pl_nss/system/exports.gyp
+++ b/lib/libpkix/pkix_pl_nss/system/exports.gyp
@@ -26,7 +26,7 @@
             'pkix_pl_rwlock.h',
             'pkix_pl_string.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/nss/exports.gyp b/lib/nss/exports.gyp
index a3638cc24..6f874f6b1 100644
--- a/lib/nss/exports.gyp
+++ b/lib/nss/exports.gyp
@@ -14,14 +14,14 @@
           '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)'
         }
       ]
     }
diff --git a/lib/pk11wrap/exports.gyp b/lib/pk11wrap/exports.gyp
index 37b572df9..b3d4bf468 100644
--- a/lib/pk11wrap/exports.gyp
+++ b/lib/pk11wrap/exports.gyp
@@ -21,14 +21,14 @@
             '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)'
         }
       ]
     }
diff --git a/lib/pkcs12/exports.gyp b/lib/pkcs12/exports.gyp
index b60caf2c1..274ef68d6 100644
--- a/lib/pkcs12/exports.gyp
+++ b/lib/pkcs12/exports.gyp
@@ -18,7 +18,7 @@
             'pkcs12.h',
             'pkcs12t.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/pkcs7/exports.gyp b/lib/pkcs7/exports.gyp
index 26c4e92c1..e5c9f0927 100644
--- a/lib/pkcs7/exports.gyp
+++ b/lib/pkcs7/exports.gyp
@@ -16,13 +16,13 @@
             '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)'
         }
       ]
     }
diff --git a/lib/pki/exports.gyp b/lib/pki/exports.gyp
index 6382c2063..a9707ae16 100644
--- a/lib/pki/exports.gyp
+++ b/lib/pki/exports.gyp
@@ -21,7 +21,7 @@
             'pkit.h',
             'pkitm.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/smime/exports.gyp b/lib/smime/exports.gyp
index 27ee989a8..3865bb4da 100644
--- a/lib/smime/exports.gyp
+++ b/lib/smime/exports.gyp
@@ -17,13 +17,13 @@
             '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)'
         }
       ]
     }
diff --git a/lib/softoken/exports.gyp b/lib/softoken/exports.gyp
index 547f84b07..d11d8e49a 100644
--- a/lib/softoken/exports.gyp
+++ b/lib/softoken/exports.gyp
@@ -15,7 +15,7 @@
             'lowkeyi.h',
             'lowkeyti.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         },
         {
           'files': [
@@ -27,7 +27,7 @@
             'softoken.h',
             'softoknt.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/sqlite/exports.gyp b/lib/sqlite/exports.gyp
index cea226db9..0a424bac8 100644
--- a/lib/sqlite/exports.gyp
+++ b/lib/sqlite/exports.gyp
@@ -14,7 +14,7 @@
           'files': [
             'sqlite3.h'
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/ssl/exports.gyp b/lib/ssl/exports.gyp
index 17986ada9..e2123af84 100644
--- a/lib/ssl/exports.gyp
+++ b/lib/ssl/exports.gyp
@@ -18,7 +18,7 @@
             'sslproto.h',
             'sslt.h'
           ],
-          'destination': '<(nss_dist_dir)/public/<(module)'
+          'destination': '<(nss_public_dist_dir)/<(module)'
         }
       ]
     }
diff --git a/lib/util/exports.gyp b/lib/util/exports.gyp
index 05cf2ae1f..eb220d2db 100644
--- a/lib/util/exports.gyp
+++ b/lib/util/exports.gyp
@@ -49,14 +49,14 @@
             '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)'
         }
       ]
     }
diff --git a/lib/zlib/exports.gyp b/lib/zlib/exports.gyp
index c3c020686..b55721818 100644
--- a/lib/zlib/exports.gyp
+++ b/lib/zlib/exports.gyp
@@ -24,7 +24,7 @@
             'zlib.h',
             'zconf.h',
           ],
-          'destination': '<(nss_dist_dir)/private/<(module)'
+          'destination': '<(nss_private_dist_dir)/<(module)'
           }
       ]
     }],