diff --git a/scheme/Makefile.am b/scheme/Makefile.am index 6f14772..5491063 100644 --- a/scheme/Makefile.am +++ b/scheme/Makefile.am @@ -1,7 +1,7 @@ scheme_SCRIPTS=load-yp.scm nobase_scheme_SCRIPTS= \ - yp.scm yp-interfaces.scm yp-packages.scm + yp.scm yp-interfaces.scm yp-packages.scm configure.scm EXTRA_DIST= $(scheme_SCRIPTS) $(nobase_scheme_SCRIPTS) CLEANFILES= load-yp.scm @@ -14,6 +14,6 @@ load-yp.scm: $(srcdir)/load-yp.scm.in install-data-hook: sed -e "s|@ypschemedir@|$(schemedir)|g" \ -e "s|@yphost@|(host)|g" \ - -e "s|@yplibsysdir@|$(libsysdir)|g" \ + -e "s|@yplibsysdir@|$(libdir)|g" \ $(srcdir)/load-yp.scm.in \ > $(DESTDIR)/$(schemedir)/load-yp.scm diff --git a/scheme/load-yp.scm.in b/scheme/load-yp.scm.in index 334c880..bc9e009 100644 --- a/scheme/load-yp.scm.in +++ b/scheme/load-yp.scm.in @@ -2,8 +2,10 @@ (load "@ypschemedir@/configure.scm") (user) (load-package 'dynamic-externals) +(load-package 'configure) (open 'dynamic-externals) (open 'external-calls) +(open 'configure) (run '(let ((initializer-name "scsh_yp_main") (module-file (string-append "@yplibsysdir@/" @yphost@ "/libscshyp.so"))) (dynamic-load module-file)