Merge pull request #14 from cgay/dev

Fix catalog directory
dylan-lang · Feb 13, 2022 · afd793e · afd793e
2 parents 4e7dbf5 + 8e358dd
commit afd793e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 102 deletions.
diff --git a/catalog.dylan b/catalog.dylan
@@ -91,15 +91,19 @@ define function catalog
         else
           subdirectory-locator(package-manager-directory(),
                                $catalog-local-directory-name,
+                               $pacman-catalog-release.release-version.version-to-string,
+                               $source-directory-name,
                                $catalog-format)
         end;
     // We pass deps?: #f here to prevent infinite recursion when `catalog` is
     // called again. pacman-catalog is a data-only package and will never have
     // any deps.
     if (~override)
-      install($pacman-catalog-release, force?: too-old?(directory), deps?: #f);
+      install($pacman-catalog-release,
+              force?: too-old?(directory),
+              deps?: #f);
     end;
-    make(<catalog>, directory: directory)
+    *catalog* := make(<catalog>, directory: directory)
   end
 end function;
 

diff --git a/tools/converter/converter.dylan b/tools/converter/converter.dylan
diff --git a/tools/converter/converter.lid b/tools/converter/converter.lid
diff --git a/tools/converter/library.dylan b/tools/converter/library.dylan