mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-20 11:40:18 +02:00
* Makefile.in (libpath.h): Omit trailing slash from path. We
shouldn't require it of users, so why put it here? Move code to initialize and search %load-path from ice-9 to C code, so we can use the load-path to find the ice-9 boot code; this makes it easier to run Guile without installing it. See corresponding changes in guile/Makefile.in. * feature.c: Move stuff concerned with the load path to load.c. (scm_compiled_library_path): Deleted. Don't #include libpath.h here. * feature.h: Don't mention scm_compiled_library_path. * load.c: #include "libpath.h" here, as well as <sys/types.h>, <sys/stat.h>, and <unistd.h> (if present). (R_OK): #define if the system hasn't deigned to. (scm_loc_load_path): New variable. (scm_init_load_path, scm_sys_search_load_path, scm_sys_try_load_path): New functions. (scm_init_load): Initialize scm_loc_load_path to point to the value cell of the Scheme %load-path variable. * load.h: Add declarations for scm_sys_search_load_path, scm_sys_try_load_path. * Makefile.in (feature.o, load.o): Dependencies updated.
This commit is contained in:
parent
3cab839236
commit
a0f52599f3
1 changed files with 3 additions and 3 deletions
|
@ -407,7 +407,7 @@ all: libguile.a
|
||||||
|
|
||||||
libpath.h: Makefile
|
libpath.h: Makefile
|
||||||
echo '/* generated by Makefile */' > libpath.h
|
echo '/* generated by Makefile */' > libpath.h
|
||||||
echo '#define LIBRARY_PATH "$(pkgdatadir)/"' >> libpath.h
|
echo '#define LIBRARY_PATH "$(pkgdatadir)/$(VERSION)"' >> libpath.h
|
||||||
|
|
||||||
# The `dist' target in the top-level Makefile uses this `dist-dir'
|
# The `dist' target in the top-level Makefile uses this `dist-dir'
|
||||||
# target to select the appropriate files for distribution from the
|
# target to select the appropriate files for distribution from the
|
||||||
|
@ -644,7 +644,7 @@ feature.o: feature.c _scm.h libguile.h __scm.h tags.h smob.h params.h \
|
||||||
posix.h print.h procprop.h procs.h ramap.h read.h root.h scmsigs.h \
|
posix.h print.h procprop.h procs.h ramap.h read.h root.h scmsigs.h \
|
||||||
sequences.h simpos.h socket.h srcprop.h stackchk.h stime.h strings.h \
|
sequences.h simpos.h socket.h srcprop.h stackchk.h stime.h strings.h \
|
||||||
strop.h strorder.h strports.h struct.h tag.h throw.h unif.h \
|
strop.h strorder.h strports.h struct.h tag.h throw.h unif.h \
|
||||||
variable.h vectors.h version.h vports.h weaks.h libpath.h feature.x
|
variable.h vectors.h version.h vports.h weaks.h feature.x
|
||||||
files.o: files.c _scm.h libguile.h __scm.h tags.h smob.h params.h \
|
files.o: files.c _scm.h libguile.h __scm.h tags.h smob.h params.h \
|
||||||
alist.h append.h arbiters.h async.h boolean.h chars.h continuations.h \
|
alist.h append.h arbiters.h async.h boolean.h chars.h continuations.h \
|
||||||
debug.h options.h dynwind.h eq.h error.h pairs.h eval.h extchrs.h \
|
debug.h options.h dynwind.h eq.h error.h pairs.h eval.h extchrs.h \
|
||||||
|
@ -775,7 +775,7 @@ load.o: load.c _scm.h libguile.h __scm.h tags.h smob.h params.h \
|
||||||
posix.h print.h procprop.h procs.h ramap.h read.h root.h scmsigs.h \
|
posix.h print.h procprop.h procs.h ramap.h read.h root.h scmsigs.h \
|
||||||
sequences.h simpos.h socket.h srcprop.h stackchk.h stime.h strings.h \
|
sequences.h simpos.h socket.h srcprop.h stackchk.h stime.h strings.h \
|
||||||
strop.h strorder.h strports.h struct.h tag.h throw.h unif.h \
|
strop.h strorder.h strports.h struct.h tag.h throw.h unif.h \
|
||||||
variable.h vectors.h version.h vports.h weaks.h load.x
|
variable.h vectors.h version.h vports.h weaks.h libpath.h load.x
|
||||||
mallocs.o: mallocs.c _scm.h libguile.h __scm.h tags.h smob.h params.h \
|
mallocs.o: mallocs.c _scm.h libguile.h __scm.h tags.h smob.h params.h \
|
||||||
alist.h append.h arbiters.h async.h boolean.h chars.h continuations.h \
|
alist.h append.h arbiters.h async.h boolean.h chars.h continuations.h \
|
||||||
debug.h options.h dynwind.h eq.h error.h pairs.h eval.h extchrs.h \
|
debug.h options.h dynwind.h eq.h error.h pairs.h eval.h extchrs.h \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue