Fix merge: restore libpath-relative global-definitions.

diff --git a/src/blowfish/blowfish.pkg b/src/blowfish/blowfish.pkg
index 5ad69c1674ddb08cde97374fa07212ef9cfdb08d..23879068afcb4b0538bb9d468824599739c5614d 100644 (file)
--- 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 56fd964ef7bdd14c89e0ae074866cbdf87d02591..2d29d9be9017771516141c420b78192e9cab5326 100644 (file)
--- 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 e4d5792d7d5d913db8cd6d074f4118ec9a148046..4178e8383a20ee0414f139748cec0d05f54aafbc 100644 (file)
--- 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 653ba5a448df4a595ebeb02b6effc58841045193..5b293b0e28c1ca2e1af7a0c14163ee18f8ea076b 100644 (file)
--- 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 e662721f98260ff1d7564f5041b40216950df987..fe9548a75781e9db8032b03eda439f453ebb8a64 100644 (file)
--- 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 231d36d03d183771d6b173682ea382f893953782..416060a6f36ae427fdd3427023d675e310da217b 100644 (file)
--- 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
 \f
-(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 c82998671f4e7d653a1eeb160dfa4f68b8c87a80..1c60559513ec34b069878f67d0a5d54bc1322e4a 100644 (file)
--- 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
 \f
-(global-definitions "../runtime/")
+(global-definitions runtime/)
 
 (define-package (x11)
   (files "x11")