fixxref: still set static gobject links in glib prefix is html_dir

Refactor code to always set the static gobject links if we located the package.

1 files changed, 8 insertions, 7 deletions

diff --git a/gtkdoc-fixxref.in b/gtkdoc-fixxref.in
index fcc0e3d..94fbaa6 100755
--- a/gtkdoc-fixxref.in
+++ b/gtkdoc-fixxref.in
@@ -120,9 +120,7 @@ my $dir;
 $dir = `pkg-config --variable=prefix glib-2.0`;
 $dir =~ s/\s+$//;
 $dir = $dir . "/share/gtk-doc/html";
-if (-d $dir && $dir ne $HTML_DIR) {
-    @TRACE@("Scanning GLib directory: $dir");
-
+if (-d $dir) {
     # Some predefined link targets to get links into type hierarchies as these
     # have no targets. These are always absolute for now.
     $Links{'GBoxed'} = "$dir/gobject/gobject-Boxed-Types.html";
@@ -130,10 +128,13 @@ if (-d $dir && $dir ne $HTML_DIR) {
     $Links{'GFlags'} = "$dir/gobject/gobject-Enumeration-and-Flag-Types.html";
     $Links{'GInterface'} = "$dir/gobject/GTypeModule.html";
 
-    if ($dir !~ m%^\Q$path_prefix\E/%) {
-        &ScanIndices ($dir, 1);
-    } else {
-        &ScanIndices ($dir, 0);
+    if ($dir ne $HTML_DIR) {
+    @TRACE@("Scanning GLib directory: $dir");
+        if ($dir !~ m%^\Q$path_prefix\E/%) {
+            &ScanIndices ($dir, 1);
+        } else {
+            &ScanIndices ($dir, 0);
+        }
     }
 }