conservatory
/
elk
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* Renamed OBJ_DIR into LIB_DIR. 

* Fixed SCM_DIR and LIB_DIR so that they take ${prefix} into account.
  * Added -I $(top_builddir)/include to INCLUDES.


git-svn-id: svn://svn.zoy.org/elk/trunk@142 55e467fa-43c5-0310-a8a2-de718669efc6
This commit is contained in:
sam 2003-09-11 06:57:26 +00:00
parent f663715179
commit d55ca1b9bf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -389,8 +389,8 @@ AC_DEFINE(HEAP_SIZE, 1024, [FIXME HARD])
# subdirectories) are created automatically, but $install_dir isn't. # subdirectories) are created automatically, but $install_dir isn't.
# Make sure $install_dir doesn't point to the top of the source tree # Make sure $install_dir doesn't point to the top of the source tree
# (i.e. choose a subdirectory or a directory outside the source tree). # (i.e. choose a subdirectory or a directory outside the source tree).
AC_DEFINE(SCM_DIR, "/usr/share/elk", [FIXME HARD]) AC_DEFINE_UNQUOTED(SCM_DIR, "${prefix}/share/elk", [Data directory])
AC_DEFINE(OBJ_DIR, "/usr/lib/elk", [FIXME HARD]) AC_DEFINE_UNQUOTED(LIB_DIR, "${prefix}/lib/elk", [Plugins directory])
#define FIND_AOUT defined(USE_LD) || defined(CAN_DUMP) || defined(INIT_OBJECTS) #define FIND_AOUT defined(USE_LD) || defined(CAN_DUMP) || defined(INIT_OBJECTS)
AC_DEFINE(FIND_AOUT, 1, [FIXME HARD]) AC_DEFINE(FIND_AOUT, 1, [FIXME HARD])
@ -468,7 +468,7 @@ AC_SUBST(MOTIF_CFLAGS)
AC_SUBST(MOTIF_LIBS) AC_SUBST(MOTIF_LIBS)
dnl Export variables dnl Export variables
INCLUDES="${INCLUDES} -I\$(top_srcdir)/include" INCLUDES="${INCLUDES} -I\$(top_srcdir)/include -I\$(top_builddir)/include"
ELK_LIBS="${ELK_LIBS} -lm" ELK_LIBS="${ELK_LIBS} -lm"
AC_SUBST(INCLUDES) AC_SUBST(INCLUDES)
AC_SUBST(ELK_LIBS) AC_SUBST(ELK_LIBS)

2
src/load.c
View File

@ -48,7 +48,7 @@ void Init_Load () {
Define_Variable (&V_Load_Path, "load-path", Define_Variable (&V_Load_Path, "load-path",
Cons (Make_String (".", 1), Cons (Make_String (".", 1),
Cons (Make_String (SCM_DIR, sizeof (SCM_DIR) - 1), Cons (Make_String (SCM_DIR, sizeof (SCM_DIR) - 1),
Cons (Make_String (OBJ_DIR, sizeof (OBJ_DIR) - 1), Null)))); Cons (Make_String (LIB_DIR, sizeof (LIB_DIR) - 1), Null))));
Define_Variable (&V_Load_Noisilyp, "load-noisily?", False); Define_Variable (&V_Load_Noisilyp, "load-noisily?", False);
Define_Variable (&V_Load_Libraries, "load-libraries", Make_String ("", 0)); Define_Variable (&V_Load_Libraries, "load-libraries", Make_String ("", 0));
} }