@@ -1,3 +1,19 @@ +2008-01-15 Michael Olson <mwolson@gnu.org> + + * Makefile.defs.default (DESTDIR): New variable which allows the + destination directory to be easily set. Thanks to gour for the + suggestion. + (ELISPDIR, INFODIR): Use it. + + * README (Compilation): Don't mention PREFIX, ELISPDIR, and + INFODIR here. + (Installation): Mention DESTDIR and PREFIX. + + * texi/muse.texi: Update copyright year. + (Installation): Don't mention PREFIX, ELISPDIR, and INFODIR in the + compilation step. Do mention DESTDIR and PREFIX in the + installation step. + 2008-01-06 Michael Olson <mwolson@gnu.org> * lisp/muse.el (muse-with-temp-buffer): Don't keep track of undo ChangeLog @@ -14,9 +14,10 @@ SITEFLAG = --no-site-file # Installation options # PREFIX is only used here. +DESTDIR = PREFIX = /usr/local -ELISPDIR = $(PREFIX)/share/emacs/site-lisp/muse -INFODIR = $(PREFIX)/info +ELISPDIR = $(DESTDIR)$(PREFIX)/share/emacs/site-lisp/muse +INFODIR = $(DESTDIR)$(PREFIX)/info # Command to use to install the Info dir entry install_info = install-info --info-dir=$(INFODIR) $(1) || : Makefile.defs.default @@ -64,9 +64,7 @@ If you want to use the `xemacs' binary to perform the compilation, you must copy `Makefile.defs.default' to `Makefile.defs' in the top-level directory, and then edit `Makefile.defs' as follows. You can put either a full path to an Emacs or XEmacs binary or just the command -name, as long as it is in the PATH. Depending on your setup, changes -to the PREFIX, ELISPDIR, and/or INFODIR variables may also need to be -made. +name, as long as it is in the PATH. EMACS = xemacs SITEFLAG = -no-site-file @@ -87,9 +85,10 @@ Copy `Makefile.defs.default' to `Makefile.defs' in the top-level directory, if you haven't done so already. Then edit the `Makefile.defs' file so that ELISPDIR points to where you want the source and compiled Muse files to be installed and INFODIR indicates -where to put the Muse manual. As mentioned earlier, you will want to -edit EMACS and SITEFLAG as shown in the Compilation section if you are -using XEmacs. +where to put the Muse manual. You may use a combination of DESTDIR +and PREFIX to further determine where the installed files should be +placed. As mentioned earlier, you will want to edit EMACS and +SITEFLAG as shown in the Compilation section if you are using XEmacs. If you are installing Muse on a Debian or Ubuntu system, you might want to change the value of INSTALLINFO as specified in README @@ -14,8 +14,8 @@ @copying This manual is for Emacs Muse version 3.11. -Copyright @copyright{} 2004, 2005, 2006, -2007 Free Software Foundation, Inc. +Copyright @copyright{} 2004, 2005, 2006, 2007, +2008 Free Software Foundation, Inc. @quotation Permission is granted to copy, distribute and/or modify this document @@ -401,9 +401,7 @@ compilation, you must copy @file{Makefile.defs.default} to @file{Makefile.defs} in the top-level directory, and then edit @file{Makefile.defs} as follows. You can put either a full path to an Emacs or XEmacs binary or just the command name, as long as it is in the -@env{PATH}. Depending on your setup, changes to the @option{PREFIX}, -@option{ELISPDIR}, and/or @option{INFODIR} variables may also need to be -made. +@env{PATH}. @example EMACS = xemacs @@ -426,9 +424,11 @@ Copy @file{Makefile.defs.default} to @file{Makefile.defs} in the top-level directory, if you haven't done so already. Then edit the @file{Makefile.defs} file so that @env{ELISPDIR} points to where you want the source and compiled Muse files to be installed and -@env{INFODIR} indicates where to put the Muse manual. As mentioned -earlier, you will want to edit @env{EMACS} and @env{SITEFLAG} as shown -in the Compilation section if you are using XEmacs. +@env{INFODIR} indicates where to put the Muse manual. You may use a +combination of @env{DESTDIR} and @env{PREFIX} to further determine where +the installed files should be placed. As mentioned earlier, you will +want to edit @env{EMACS} and @env{SITEFLAG} as shown in the Compilation +section if you are using XEmacs. If you are installing Muse on a Debian or Ubuntu system, you might want to change the value of @env{INSTALLINFO} as specified in texi/muse.texi 245b79ced2e000a82390de405f44a92c1fd51e71 Michael W. Olson mwolson@gnu.org http://github.com/alexott/muse/commit/d10252466fe9291a00cd98d1de2ad15a3f28e582 d10252466fe9291a00cd98d1de2ad15a3f28e582 2008-01-15T09:34:16-08:00 2008-01-15T09:34:16-08:00 Makefile.defs.default: Add support for DESTDIR. 587f11895fb6f03bcd81429e5525114af8a62540 Michael W. Olson mwolson@gnu.org