--- cmake/macros/Private.cmake.orig	2020-04-13 14:32:52.000000000 -0400
+++ cmake/macros/Private.cmake	2021-02-02 01:56:54.000000000 -0500
@@ -97,7 +97,7 @@
     _get_resources_dir_name(PLUG_INFO_RESOURCE_PATH)
     set(PLUG_INFO_ROOT "..")
     set(PLUG_INFO_PLUGIN_NAME "pxr.${libTarget}")
-    set(PLUG_INFO_LIBRARY_PATH "${pluginToLibraryPath}")
+    set(PLUG_INFO_LIBRARY_PATH "")
 
     configure_file(
         ${plugInfoPath}
@@ -1161,10 +1161,10 @@
     _get_install_dir("include/${PXR_PREFIX}/${NAME}" headerInstallPrefix)
     _get_install_dir("lib" libInstallPrefix)
     if(isPlugin)
-        _get_install_dir("plugin" pluginInstallPrefix)
+        _get_install_dir("share/usd/plugins" pluginInstallPrefix)
         if(NOT PXR_INSTALL_SUBDIR)
             # XXX -- Why this difference?
-            _get_install_dir("plugin/usd" pluginInstallPrefix)
+            _get_install_dir("share/usd/plugins" pluginInstallPrefix)
         endif()
         if(NOT isObject)
             # A plugin embedded in the monolithic library is found in
@@ -1256,7 +1256,7 @@
             MFB_ALT_PACKAGE_NAME=${PXR_PACKAGE}
             MFB_PACKAGE_MODULE=${pythonModuleName}
             PXR_BUILD_LOCATION=usd
-            PXR_PLUGIN_BUILD_LOCATION=../plugin/usd
+            PXR_PLUGIN_BUILD_LOCATION=../share/usd/plugins
             ${pxrInstallLocation}
             ${pythonModulesEnabled}
             ${apiPrivate}
--- cmake/macros/Public.cmake.orig	2020-04-13 14:32:52.000000000 -0400
+++ cmake/macros/Public.cmake	2021-02-02 01:57:14.000000000 -0500
@@ -825,7 +825,7 @@
          "${plugInfoContents}")
     install(
         FILES "${CMAKE_CURRENT_BINARY_DIR}/usd_plugInfo.json"
-        DESTINATION plugin/usd
+        DESTINATION share/usd/plugins
         RENAME "plugInfo.json"
     )
 endfunction() # pxr_setup_plugins