From: Matt Birkholz <matt@birchwood-abbey.net>
Date: Wed, 28 Nov 2018 23:50:41 +0000 (-0700)
Subject: Fix merge: restore libpath-relative global-definitions.
X-Git-Tag: mit-scheme-pucked-10.1.2~3
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=58191f7c63c87c9b3ce95d66340b31b884fa9efe;p=mit-scheme.git

Fix merge: restore libpath-relative global-definitions.
---

diff --git a/src/blowfish/blowfish.pkg b/src/blowfish/blowfish.pkg
index 5ad69c167..23879068a 100644
--- a/src/blowfish/blowfish.pkg
+++ b/src/blowfish/blowfish.pkg
@@ -24,7 +24,7 @@ USA.
 
 |#
 
-(global-definitions "../runtime/")
+(global-definitions runtime/)
 
 (define-package (blowfish)
   (files "blowfish")
diff --git a/src/gdbm/gdbm.pkg b/src/gdbm/gdbm.pkg
index 56fd964ef..2d29d9be9 100644
--- a/src/gdbm/gdbm.pkg
+++ b/src/gdbm/gdbm.pkg
@@ -24,7 +24,7 @@ USA.
 
 |#
 
-(global-definitions "../runtime/")
+(global-definitions runtime/)
 
 (define-package (gdbm)
   (files "gdbm")
diff --git a/src/imail/imail.pkg b/src/imail/imail.pkg
index e4d5792d7..4178e8383 100644
--- a/src/imail/imail.pkg
+++ b/src/imail/imail.pkg
@@ -26,10 +26,10 @@ USA.
 
 ;;;; IMAIL mail reader: packaging
 
-(global-definitions "../runtime/")
-(global-definitions "../sos/")
-(global-definitions "../edwin/")
-(global-definitions "../star-parser/parser")
+(global-definitions runtime/)
+(global-definitions sos/)
+(global-definitions edwin/)
+(global-definitions star-parser/parser)
 
 (define-package (edwin imail)
   (files "imail-util"
diff --git a/src/mcrypt/mcrypt.pkg b/src/mcrypt/mcrypt.pkg
index 653ba5a44..5b293b0e2 100644
--- a/src/mcrypt/mcrypt.pkg
+++ b/src/mcrypt/mcrypt.pkg
@@ -24,7 +24,7 @@ USA.
 
 |#
 
-(global-definitions "../runtime/")
+(global-definitions runtime/)
 
 (define-package (mcrypt)
   (files "mcrypt")
diff --git a/src/pgsql/pgsql.pkg b/src/pgsql/pgsql.pkg
index e662721f9..fe9548a75 100644
--- a/src/pgsql/pgsql.pkg
+++ b/src/pgsql/pgsql.pkg
@@ -24,7 +24,7 @@ USA.
 
 |#
 
-(global-definitions "../runtime/")
+(global-definitions runtime/)
 
 (define-package (postgresql)
   (files "pgsql")
diff --git a/src/x11-screen/x11-screen.pkg b/src/x11-screen/x11-screen.pkg
index 231d36d03..416060a6f 100644
--- a/src/x11-screen/x11-screen.pkg
+++ b/src/x11-screen/x11-screen.pkg
@@ -25,9 +25,9 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 ;;;; Edwin Packaging
 
-(global-definitions "../runtime/")
-(global-definitions "../edwin/")
-(global-definitions "../x11/")
+(global-definitions runtime/)
+(global-definitions edwin/)
+(global-definitions x11/)
 
 (define-package (edwin screen x11-screen)
   (files "x11-screen")
diff --git a/src/x11/x11.pkg b/src/x11/x11.pkg
index c82998671..1c6055951 100644
--- a/src/x11/x11.pkg
+++ b/src/x11/x11.pkg
@@ -25,7 +25,7 @@ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
 
 ;;;; X11 Graphics Packaging
 
-(global-definitions "../runtime/")
+(global-definitions runtime/)
 
 (define-package (x11)
   (files "x11")