[gjs/gnome-3-34] gjs/context.cpp: Make typelib search path consistent

[Philip Chimento <pchimento src gnome org>]

commit eb16e1a9edc1b9e8763a7406b5112078ae0bba9f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Oct 25 17:44:38 2019 +0800

    gjs/context.cpp: Make typelib search path consistent
    
    It turns out that we should install GjsPrivate-1.0.typelib into
    $(prefix)/lib/gjs/girepository-1.0, not just
    $(prefix)/lib/girepository-1.0, which the Windows code assumed.
    
    Make things consistent on Windows in gjs/context.cpp, and update the
    NMake Makefiles as well for this; and stop installing GjsPrivate-1.0.gir
    in the NMake Makefiles, since the Meson build files do not install that
    file.

 gjs/context.cpp   | 2 +-
 win32/install.mak | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/gjs/context.cpp b/gjs/context.cpp
index ae06ed39..21c5b72a 100644
--- a/gjs/context.cpp
+++ b/gjs/context.cpp
@@ -281,7 +281,7 @@ gjs_context_class_init(GjsContextClass *klass)
 #ifdef G_OS_WIN32
         extern HMODULE gjs_dll;
         char *basedir = g_win32_get_package_installation_directory_of_module (gjs_dll);
-        char *priv_typelib_dir = g_build_filename (basedir, "lib", "girepository-1.0", NULL);
+        char *priv_typelib_dir = g_build_filename (basedir, "lib", "gjs", "girepository-1.0", NULL);
         g_free (basedir);
 #else
         char *priv_typelib_dir = g_build_filename (PKGLIBDIR, "girepository-1.0", NULL);
diff --git a/win32/install.mak b/win32/install.mak
index aafc009e..907bfa84 100644
--- a/win32/install.mak
+++ b/win32/install.mak
@@ -14,5 +14,5 @@ install: all
        @copy /b vs$(VSVER)\$(CFG)\$(PLAT)\gjs-console.pdb $(PREFIX)\bin
        @for %h in ($(LIBGJS_HEADERS)) do @copy ..\%h $(PREFIX)\include\gjs-1.0\%h
        @rem Copy the generated introspection files, if built
-       @if exist vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.gir copy 
vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.gir $(PREFIX)\share\gir-1.0
-       @if exist vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.typelib copy /b 
vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.typelib $(PREFIX)\lib\girepository-1.0
+       @if exist vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.typelib mkdir $(PREFIX)\lib\gjs\girepository-1.0
+       @if exist vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.typelib copy /b 
vs$(VSVER)\$(CFG)\$(PLAT)\GjsPrivate-1.0.typelib $(PREFIX)\lib\gjs\girepository-1.0