diff options
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 8 | ||||
| -rw-r--r-- | nt/paths.h | 15 |
2 files changed, 17 insertions, 6 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 966407e5ed3..ffdfb5dcab2 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2012-08-04 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * paths.h (PATH_LOADSEARCH, PATH_SITELOADSEARCH, PATH_EXEC) | ||
| 4 | (PATH_DATA, PATH_DOC): Replace dummy directory names with | ||
| 5 | directories relative to %emacs_dir%. | ||
| 6 | (PATH_EXEC): Add lib-src/oo-spd/i386 and lib-src/oo/i386, to cater | ||
| 7 | to the use case of running un-installed Emacs. | ||
| 8 | |||
| 1 | 2012-08-03 Juanma Barranquero <lekktu@gmail.com> | 9 | 2012-08-03 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 10 | ||
| 3 | * config.nt: Sync with autogen/config.in. | 11 | * config.nt: Sync with autogen/config.in. |
diff --git a/nt/paths.h b/nt/paths.h index d3a41e3c541..801d187646f 100644 --- a/nt/paths.h +++ b/nt/paths.h | |||
| @@ -18,14 +18,18 @@ GNU General Public License for more details. | |||
| 18 | You should have received a copy of the GNU General Public License | 18 | You should have received a copy of the GNU General Public License |
| 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | 19 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 20 | 20 | ||
| 21 | /* Relative file names in this file that begin with "%emacs_dir%/" are | ||
| 22 | treated specially by decode_env_path: they are expanded relative to | ||
| 23 | the value of the emacs_dir environment variable, which points to | ||
| 24 | the root of the Emacs tree. */ | ||
| 21 | 25 | ||
| 22 | /* The default search path for Lisp function "load". | 26 | /* The default search path for Lisp function "load". |
| 23 | Together with PATH_SITELOADSEARCH, this sets load-path. */ | 27 | Together with PATH_SITELOADSEARCH, this sets load-path. */ |
| 24 | /* #define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp" */ | 28 | /* #define PATH_LOADSEARCH "/usr/local/lib/emacs/lisp" */ |
| 25 | #define PATH_LOADSEARCH "C:/emacs/lisp" | 29 | #define PATH_LOADSEARCH "%emacs_dir%/lisp;%emacs_dir%/leim" |
| 26 | 30 | ||
| 27 | /* Like PATH_LOADSEARCH, but contains the non-standard pieces. */ | 31 | /* Like PATH_LOADSEARCH, but contains the non-standard pieces. */ |
| 28 | #define PATH_SITELOADSEARCH "C:/emacs/site-lisp" | 32 | #define PATH_SITELOADSEARCH "%emacs_dir%/site-lisp;%emacs_dir%/../site-lisp" |
| 29 | 33 | ||
| 30 | /* Like PATH_LOADSEARCH, but used only when Emacs is dumping. This | 34 | /* Like PATH_LOADSEARCH, but used only when Emacs is dumping. This |
| 31 | path is usually identical to PATH_LOADSEARCH except that the entry | 35 | path is usually identical to PATH_LOADSEARCH except that the entry |
| @@ -39,13 +43,13 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 39 | variable exec-directory. exec-directory is used for finding | 43 | variable exec-directory. exec-directory is used for finding |
| 40 | executables and other architecture-dependent files. */ | 44 | executables and other architecture-dependent files. */ |
| 41 | /* #define PATH_EXEC "/usr/local/lib/emacs/etc" */ | 45 | /* #define PATH_EXEC "/usr/local/lib/emacs/etc" */ |
| 42 | #define PATH_EXEC "C:/emacs/bin" | 46 | #define PATH_EXEC "%emacs_dir%/bin;%emacs_dir%/lib-src/oo-spd/i386;%emacs_dir%/lib-src/oo/i386" |
| 43 | 47 | ||
| 44 | /* Where Emacs should look for its architecture-independent data | 48 | /* Where Emacs should look for its architecture-independent data |
| 45 | files, like the NEWS file. The lisp variable data-directory | 49 | files, like the NEWS file. The lisp variable data-directory |
| 46 | is set to this value. */ | 50 | is set to this value. */ |
| 47 | /* #define PATH_DATA "/usr/local/lib/emacs/data" */ | 51 | /* #define PATH_DATA "/usr/local/lib/emacs/data" */ |
| 48 | #define PATH_DATA "C:/emacs/data" | 52 | #define PATH_DATA "%emacs_dir%/etc" |
| 49 | 53 | ||
| 50 | /* Where Emacs should look for X bitmap files. | 54 | /* Where Emacs should look for X bitmap files. |
| 51 | The lisp variable x-bitmap-file-path is set based on this value. */ | 55 | The lisp variable x-bitmap-file-path is set based on this value. */ |
| @@ -53,11 +57,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 53 | 57 | ||
| 54 | /* Where Emacs should look for its docstring file. The lisp variable | 58 | /* Where Emacs should look for its docstring file. The lisp variable |
| 55 | doc-directory is set to this value. */ | 59 | doc-directory is set to this value. */ |
| 56 | #define PATH_DOC "C:/emacs/etc" | 60 | #define PATH_DOC "%emacs_dir%/etc" |
| 57 | 61 | ||
| 58 | /* Where the configuration process believes the info tree lives. The | 62 | /* Where the configuration process believes the info tree lives. The |
| 59 | lisp variable configure-info-directory gets its value from this | 63 | lisp variable configure-info-directory gets its value from this |
| 60 | macro, and is then used to set the Info-default-directory-list. */ | 64 | macro, and is then used to set the Info-default-directory-list. */ |
| 61 | /* #define PATH_INFO "/usr/local/info" */ | 65 | /* #define PATH_INFO "/usr/local/info" */ |
| 62 | #define PATH_INFO "C:/emacs/info" | 66 | #define PATH_INFO "C:/emacs/info" |
| 63 | |||