* doc.c (Fsnarf_documentation):

* Makefile.in (temacs${EXEEXT}, mostlyclean): Undo last change.

diff --git a/src/ChangeLog.unicode b/src/ChangeLog.unicode
index 2e3ac05759291ec960ce77023b343e209dceaeeb..6350500194f13eda240887d316ecd38cc099ecc9 100644 (file)
--- a/src/ChangeLog.unicode
+++ b/src/ChangeLog.unicode
@@ -1,3 +1,8 @@
+2007-10-21  Jason Rumney  <jasonr@gnu.org>
+
+       * doc.c (Fsnarf_documentation):
+       * Makefile.in (temacs${EXEEXT}, mostlyclean): Undo last change.
+
 2007-10-12  Miles Bader  <miles@gnu.org>
 
        * src/dispextern.h (struct glyph_row): Only define "clip" field if

diff --git a/src/Makefile.in b/src/Makefile.in
index 1ff7ce3033917ab2738aa56509b391a83f44853e..11e4d00b4881c2589bc3697053f676dbc273723f 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1014,7 +1014,7 @@ ${lispsource}international/charprop.el: temacs${EXEEXT} ${UNIDATA}
 #endif
 
 temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} ${otherobj} OBJECTS_MACHINE prefix-args${EXEEXT}
-       echo "${obj} ${otherobj} " OBJECTS_MACHINE > ${etc}buildobj.lst
+       echo "${obj} ${otherobj} " OBJECTS_MACHINE > buildobj.lst
        $(LD) YMF_PASS_LDFLAGS (${STARTFLAGS} ${TEMACS_LDFLAGS}) $(LDFLAGS) \
     -o temacs ${STARTFILES} ${obj} ${otherobj}  \
     OBJECTS_MACHINE ${LIBES}
@@ -1363,7 +1363,7 @@ mostlyclean:
        rm -f temacs${EXEEXT} prefix-args${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a
        rm -f ../etc/DOC
        rm -f bootstrap-emacs${EXEEXT} emacs-${version}${EXEEXT}
-       rm -f ${etc}buildobj.lst
+       rm -f buildobj.lst
 clean: mostlyclean
        rm -f emacs-*${EXEEXT} emacs${EXEEXT}
 /**/# This is used in making a distribution.

diff --git a/src/doc.c b/src/doc.c
index c4af523baac12b62f764884d5552fce41fd30d24..dd7f4ae0eb9b581b6ee88b09ae9d78a41d8d610c 100644 (file)
--- a/src/doc.c
+++ b/src/doc.c
@@ -629,10 +629,8 @@ the same file name is found in the `doc-directory'.  */)
     int nr_read;
     char *cp = NULL;
     char *beg, *end;
-    Lisp_Object buildobj = Fexpand_file_name (build_string ("buildobj.lst"),
-                                             Vdoc_directory);
 
-    fd = emacs_open (SDATA (buildobj), O_RDONLY, 0);
+    fd = emacs_open ("buildobj.lst", O_RDONLY, 0);
     if (fd < 0)
       report_file_error ("Opening file buildobj.lst", Qnil);