Mercurial > emacs

comparison src/callproc.c @ 5618:a70dc7c886d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(init_callproc): Use Vinstallation_directory.
author Richard M. Stallman <rms@gnu.org>
date Mon, 17 Jan 1994 00:46:25 +0000
parents b9e2884ca8e6
children a0f01b43a459
comparison
equal deleted inserted replaced
5617:0b312b3fa24e 5618:a70dc7c886d0
774 char *data_dir = egetenv ("EMACSDATA"); 774 char *data_dir = egetenv ("EMACSDATA");
775 775
776 register char * sh; 776 register char * sh;
777 Lisp_Object tempdir; 777 Lisp_Object tempdir;
778 778
779 if (initialized && !NILP (Vinvocation_directory)) 779 if (initialized && !NILP (Vinstallation_directory))
780 { 780 {
781 /* Add to the path the ../lib-src dir of the Emacs executable, 781 /* Add to the path the lib-src subdir of the installation dir. */
782 if that dir exists. */ 782 Lisp_Object tem;
783 Lisp_Object tem, tem1; 783 tem = Fexpand_file_name (build_string ("lib-src"),
784 tem = Fexpand_file_name (build_string ("../lib-src"), 784 Vinstallation_directory);
785 Vinvocation_directory); 785 if (NILP (Fmember (tem, Vexec_path)))
786 tem1 = Ffile_exists_p (tem);
787 if (!NILP (tem1) && NILP (Fmember (tem, Vexec_path)))
788 { 786 {
789 Vexec_path = nconc2 (Vexec_path, Fcons (tem, Qnil)); 787 Vexec_path = nconc2 (Vexec_path, Fcons (tem, Qnil));
790 Vexec_directory = Ffile_name_as_directory (tem); 788 Vexec_directory = Ffile_name_as_directory (tem);
791 789
792 /* If we use ../lib-src, maybe use ../etc as well. 790 /* If we use ../lib-src, maybe use ../etc as well.
793 Do so if ../etc exists and has our DOC-... file in it. */ 791 Do so if ../etc exists and has our DOC-... file in it. */
794 if (data_dir == 0) 792 if (data_dir == 0)
795 { 793 {
796 Lisp_Object tem, tem2, tem3; 794 tem = Fexpand_file_name (build_string ("etc"),
797 tem = Fexpand_file_name (build_string ("../etc"), 795 Vinstallation_directory);
798 Vinvocation_directory); 796 Vdata_directory = Ffile_name_as_directory (tem);
799 tem2 = Fexpand_file_name (Vdoc_file_name, tem);
800 tem3 = Ffile_exists_p (tem2);
801 if (!NILP (tem3))
802 Vdata_directory = Ffile_name_as_directory (tem);
803 } 797 }
804 } 798 }
805 } 799 }
806 800
807 tempdir = Fdirectory_file_name (Vexec_directory); 801 tempdir = Fdirectory_file_name (Vexec_directory);