Bug 1311615 - Building with gyp should copy headers, libs, executables to the right directory r=franziskus

Differential Revision: https://nss-dev.phacility.com/D104

12 files changed, 24 insertions, 24 deletions

diff --git a/lib/libpkix/include/exports.gyp b/lib/libpkix/include/exports.gyp
index 7262de41d..58f1544fc 100644
--- a/lib/libpkix/include/exports.gyp
+++ b/lib/libpkix/include/exports.gyp
@@ -27,7 +27,7 @@
             'pkix_util.h',
             'pkixt.h'
           ],
-          'destination': '<(PRODUCT_DIR)/dist/<(module)/private'
+          'destination': '<(nss_dist_dir)/private/<(module)'
         }
       ]
     }
@@ -35,4 +35,4 @@
   'variables': {
     'module': 'nss'
   }
-}
\ No newline at end of file
+}
diff --git a/lib/libpkix/pkix/certsel/exports.gyp b/lib/libpkix/pkix/certsel/exports.gyp
index 0fe0ff69c..8e0374aa3 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': '<(PRODUCT_DIR)/dist/<(module)/private'
+          'destination': '<(nss_dist_dir)/private/<(module)'
         }
       ]
     }
@@ -23,4 +23,4 @@
   'variables': {
     'module': 'nss'
   }
-}
\ No newline at end of file
+}
diff --git a/lib/libpkix/pkix/checker/exports.gyp b/lib/libpkix/pkix/checker/exports.gyp
index 15ed261fa..993eaef42 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': '<(PRODUCT_DIR)/dist/<(module)/private'
+          'destination': '<(nss_dist_dir)/private/<(module)'
         }
       ]
     }
@@ -34,4 +34,4 @@
   'variables': {
     'module': 'nss'
   }
-}
\ No newline at end of file
+}
diff --git a/lib/libpkix/pkix/crlsel/exports.gyp b/lib/libpkix/pkix/crlsel/exports.gyp
index 2c1deb826..b80dfc2e4 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': '<(PRODUCT_DIR)/dist/<(module)/private'
+          'destination': '<(nss_dist_dir)/private/<(module)'
         }
       ]
     }
@@ -23,4 +23,4 @@
   'variables': {
     'module': 'nss'
   }
-}
\ No newline at end of file
+}
diff --git a/lib/libpkix/pkix/params/exports.gyp b/lib/libpkix/pkix/params/exports.gyp
index e42d1431f..3131ed008 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': '<(PRODUCT_DIR)/dist/<(module)/private'
+          'destination': '<(nss_dist_dir)/private/<(module)'
         }
       ]
     }
@@ -25,4 +25,4 @@
   'variables': {
     'module': 'nss'
   }
-}
\ No newline at end of file
+}
diff --git a/lib/libpkix/pkix/results/exports.gyp b/lib/libpkix/pkix/results/exports.gyp
index 3fb5228e8..7379a5d7f 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': '<(PRODUCT_DIR)/dist/<(module)/private'
+          'destination': '<(nss_dist_dir)/private/<(module)'
         }
       ]
     }
@@ -25,4 +25,4 @@
   'variables': {
     'module': 'nss'
   }
-}
\ No newline at end of file
+}
diff --git a/lib/libpkix/pkix/store/exports.gyp b/lib/libpkix/pkix/store/exports.gyp
index 38f4ab089..3f6cb4798 100644
--- a/lib/libpkix/pkix/store/exports.gyp
+++ b/lib/libpkix/pkix/store/exports.gyp
@@ -14,7 +14,7 @@
           'files': [
             'pkix_store.h'
           ],
-          'destination': '<(PRODUCT_DIR)/dist/<(module)/private'
+          'destination': '<(nss_dist_dir)/private/<(module)'
         }
       ]
     }
@@ -22,4 +22,4 @@
   'variables': {
     'module': 'nss'
   }
-}
\ No newline at end of file
+}
diff --git a/lib/libpkix/pkix/top/exports.gyp b/lib/libpkix/pkix/top/exports.gyp
index 114afcbf9..bc66ccc68 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': '<(PRODUCT_DIR)/dist/<(module)/private'
+          'destination': '<(nss_dist_dir)/private/<(module)'
         }
       ]
     }
@@ -24,4 +24,4 @@
   'variables': {
     'module': 'nss'
   }
-}
\ No newline at end of file
+}
diff --git a/lib/libpkix/pkix/util/exports.gyp b/lib/libpkix/pkix/util/exports.gyp
index 23db76575..d0bf573aa 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': '<(PRODUCT_DIR)/dist/<(module)/private'
+          'destination': '<(nss_dist_dir)/private/<(module)'
         }
       ]
     }
@@ -25,4 +25,4 @@
   'variables': {
     'module': 'nss'
   }
-}
\ No newline at end of file
+}
diff --git a/lib/libpkix/pkix_pl_nss/module/exports.gyp b/lib/libpkix/pkix_pl_nss/module/exports.gyp
index a91701a8a..41fe3e297 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': '<(PRODUCT_DIR)/dist/<(module)/private'
+          'destination': '<(nss_dist_dir)/private/<(module)'
         }
       ]
     }
@@ -33,4 +33,4 @@
   'variables': {
     'module': 'nss'
   }
-}
\ No newline at end of file
+}
diff --git a/lib/libpkix/pkix_pl_nss/pki/exports.gyp b/lib/libpkix/pkix_pl_nss/pki/exports.gyp
index bfbeea241..89d4e012e 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': '<(PRODUCT_DIR)/dist/<(module)/private'
+          'destination': '<(nss_dist_dir)/private/<(module)'
         }
       ]
     }
@@ -38,4 +38,4 @@
   'variables': {
     'module': 'nss'
   }
-}
\ No newline at end of file
+}
diff --git a/lib/libpkix/pkix_pl_nss/system/exports.gyp b/lib/libpkix/pkix_pl_nss/system/exports.gyp
index d17383621..d90e27609 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': '<(PRODUCT_DIR)/dist/<(module)/private'
+          'destination': '<(nss_dist_dir)/private/<(module)'
         }
       ]
     }
@@ -34,4 +34,4 @@
   'variables': {
     'module': 'nss'
   }
-}
\ No newline at end of file
+}