1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-14 09:39:42 +00:00
Commit Graph

60 Commits

Author SHA1 Message Date
Richard M. Stallman
21e8e1db59 (do-install): Partially rewrite using `if'. 1993-06-02 05:16:03 +00:00
Richard M. Stallman
acfb884cec (do-install): Correct previous etc-copying change.
(src/Makefile): Insert --x-libraries option into LD_SWITCH_X_SITE.
1993-06-01 22:49:36 +00:00
Richard M. Stallman
f8bc869a31 (do-install): Use `-' in tar options. 1993-05-31 21:28:36 +00:00
Richard M. Stallman
af1d3b64a2 (do-install): Copy the DOC-* files from the build
etc directory, as well as lots of things from ${srcdir}/etc.
1993-05-31 06:07:08 +00:00
Jim Blandy
09b89128ef Pass in LD_SWITCH_X_SITE. 1993-05-31 06:03:21 +00:00
Jim Blandy
8fd812d1cd * Makefile.in (mkdir, clean, mostlyclean, do-install): Use `(cd
foo && pwd)` instead of `(cd foo ; pwd)` to get the canonical name
	of a directory; cd might fail, and have pwd print out the current
	directory.
1993-05-30 19:38:49 +00:00
Jim Blandy
04d9326a12 * Makefile.in: Use Makefile comments, not C comments. 1993-05-29 21:11:09 +00:00
Jim Blandy
b305e8e580 * Makefile.in (src:, lib-src:, FRC:): force the src and lib-src
targets to be executed even if make remembers that it has already
	stisfied FRC.
1993-05-29 19:30:26 +00:00
Richard M. Stallman
2b7f46c9a2 (do-install): Delete redundant code to copy etc twice. 1993-05-29 16:38:15 +00:00
Jim Blandy
97c701137d * make-dist: Make a `site-lisp' directory in the distribution,
instead of a `local-lisp' directory, which hasn't been the
	appropriate name for a long time.
	* Makefile.in (@rip_paths@locallisppath): Use site-lisp directory
	from the distribution first, then /usr/local/lib/emacs/site-lisp.
1993-05-28 07:38:26 +00:00
Jim Blandy
65607c1f52 * Makefile.in (do-install): Correctly detect if ./etc and
${srcdir}/etc are the same.
1993-05-28 06:55:13 +00:00
Richard M. Stallman
335bb18dcb (do-install): Add `shift' command. 1993-05-27 23:57:41 +00:00
Richard M. Stallman
78c7997f4d (COPYDESTS, COPYDIR): Delete external-lisp dir.
(externallispdir): Var deleted.
1993-05-27 22:15:01 +00:00
Richard M. Stallman
88190b5416 (do-install): Delete the dest dir, not the source dir,
when they are different.
1993-05-27 22:12:55 +00:00
Jim Blandy
4736b17e0b * Makefile.in (${SUBDIR}): Pass the value of the make variable to
subdirectory makes.
1993-05-27 02:27:22 +00:00
Jim Blandy
c469713a1e * Makefile.in (mkdir): Make all the directories in locallisppath. 1993-05-26 21:50:00 +00:00
Jim Blandy
005775ce97 * Makefile.in (do-install): Don't remove a destination directory
if it's the same as the source.  If ${srcdir}/info == ${infodir},
	don't try to copy the info files.

	* Makefile.in (COPYDIR, COPYDESTS): Don't mention etc twice; this
	doesn't work if you're not using a separate source directory.
	(do-install): Copy the build tree's etc directory only after
	making sure it's not also the source tree's etc directory.
1993-05-26 18:27:58 +00:00
Richard M. Stallman
1969729543 (INSTALL): Add definition. 1993-05-25 20:00:53 +00:00
Jim Blandy
00c2990984 * Makefile.in (srcdir): Remove comment saying this doesn't work. 1993-05-25 14:15:52 +00:00
Jim Blandy
8b14d29674 * Makefile.in (src/paths.h): Edit the `infodir' variable into this
too, as the value of the PATH_INFO macro.

	* Makefile.in (install): Split this into `install' and
	`do-install', to give people more control over exactly what gets
	done.
	(do-install): New target, containing the guts of `install'.  Don't
	remove and recreate the directories inside the copying loop - do
	it all before the copying loop.  Pass more flags to the lib-src
	make.
	(mkdir): Create ${infodir}, ${mandir}, and ${sitelispdir} here, to
	avoid errors and warnings.
1993-05-25 06:18:24 +00:00
Jim Blandy
fe7cd06e97 * Makefile.in: Doc fix. 1993-05-24 16:01:41 +00:00
Jim Blandy
86ddcc58d5 * configure.in: Add support for the `--exec-prefix' option.
* Makefile.in: Accept that support.

	* configure.in: Use the AC_PROG_INSTALL macro.
	* Makefile.in (INSTALL): Variable removed.
	(INSTALL_PROGRAM, INSTALL_DATA): Accept these values from configure.
1993-05-24 06:08:13 +00:00
Jim Blandy
46af2ed8ec * Makefile.in (C_SWITCH_X_SITE): New variable - get this from
configure.in.
	(oldXMenu/Makefile): Edit C_SWITCH_X_SITE into this.
1993-05-23 21:49:20 +00:00
Jim Blandy
8d467c70c0 * configure.in: Implement the --prefix option.
* Makefile.in (prefix): Add support for it here.

	* Makefile.in (install): Don't assume that the files in the `info'
	subdirectory match  *.info.  They don't have that prefix.
1993-05-23 04:42:11 +00:00
Jim Blandy
8b8d8332a0 * Makefile.in (oldXMenu/Makefile): Take oldXMenu/Makefile.in as
the source for the sed command, not oldXMenu/Makefile.
1993-05-18 20:32:36 +00:00
Jim Blandy
f241976e9b * Makefile.in (oldXMenu/Makefile): Make this depend on
${srcdir}/oldXMenu/Makefile.in, not itself.
1993-05-16 00:44:32 +00:00
Jim Blandy
3dbc7e3236 More changes from David J. Mackenzie.
* Makefile.in (install.sysv, install.xenix, install.aix): Targets
	removed; autoconf and config.h should specify all these
	differences.
	(buildlisppath): Make this path depend on ${srcdir}.
	(INSTALLFLAGS): Removed.
	(INSTALL): Include the -c flag.
	(install): Change the way we invoke install accordingly.
1993-05-15 23:57:11 +00:00
Jim Blandy
ddb7302160 Install ${srcdir} changes from DJM.
* Makefile.in (SUBDIR_MAKEFILES): Add oldXMenu/Makefile to this
	list.
	(COPYDIR, COPYDESTS): Install files from both the etc directory in
	the source tree and the etc directory in the object tree.
	(${SUBDIR}): Pass the prefix variable down to submakes.
	(everywhere): Use `sed', not `/bin/sed'.  Not all systems have sed
	in /bin.
	(lib-src/Makefile, src/Makefile, oldXMenu/Makefile): Edit in
	values for srcdir and VPATH.
	(install): Add `v' flag to tar command.  Make sure that `dir'
	exists in ${srcdir}/info before copying it.  Remember that the man
	pages come from the source tree, not the object tree.
	* configure.in: Remove remarks saying that the --srcdir option
	doesn't work.
	Create the etc directory in the object tree.
	Recognize configuration names of the form *-sun-solaris*.
	Recognize sunos5 and solaris as operating system names.
1993-05-15 22:57:27 +00:00
Jim Blandy
6d8856bd6b original log message lost to overeager RCS user -JimB 1993-05-15 21:38:29 +00:00
Jim Blandy
b6472fc16b * Makefile.in (DEFS): Deleted; since we're using AC_CONFIG_HEADER,
this is always just -DHAVE_CONFIG_H.

	The GNU coding standards specify that CFLAGS should be left for
	users to set.
	* Makefile.in (CFLAGS): Let configure determine the default value
	for this.  Don't
	have it default to DEFS.
	(${SUBDIR}): Pass CFLAGS down to submakes, not DEFS.
	(lib-src/Makefile, src/Makefile): Edit the default value for
	CFLAGS into these files, not DEFS.
	* configure.in (CFLAGS): Choose a default value for this - "-g"
	normally, or "-g -O" if we're using GCC.  Edit it into the
	top-level Makefile.

	* configure.in: Add AC_LN_S test, so we can tell whether or not we
	can use a symbolic link to get the X Menu library into src.
	* Makefile.in (LN_S): New variable.
	(src/Makefile): Edit the value of LN_S into this makefile.
1993-05-09 22:51:16 +00:00
Jim Blandy
d3245f70ee * configure.in: Use the AC_ALLOCA test.
* Makefile.in (ALLOCA): New variable, to be set by ./configure.
	(lib-src/Makefile): Edit the value of ALLOCA into lib-src/Makefile.

	* Makefile.in (install): Print out the name of the directory we're
	copying, so people can have some idea of whether we're making
	progress.

	* Makefile.in (install.aix, install.xenix, install.sysv, install):
	Don't forget to re-create the COPYDESTS directories after we clear
	them out.

	* Makefile.in: Add autoconf cookies so that the configure
	script can comment out sections of path variable definitions to
	choose between the installable configuration and the run-in-place
	configuration.
	* configure.in: Add new option `--run-in-place', to select the
	run-in-place path definitions.

	* Makefile.in (install, install.sysv, install.xenix, install.aix):
	Make sure that each source directory exists, and is different from
	the destination directory; then, delete the destination before
	copying over the source.
1993-05-03 02:06:16 +00:00
Jim Blandy
c75ff9db20 * Makefile.in (clean mostlyclean): Missing right paren.
Change `configure' to a mixture of custom code and autoconf stuff.
	autoconf can't derive all the information we need, but we'd really
	like to be able to take advantage of some of its tests, and its
	file-editing facilities.
	* configure.in: Renamed from configure.
	Quote the sections of shell script we want copied literally to
	the configure script.
	(compile): Initialize this to make the autoconf macros' code happy.
	Use AC_PROG_CC, AC_CONST, and AC_RETSIGTYPE instead of writing out
	code to do their jobs.
	Use autoconf to produce Makefile and src/config.h.
	Remove the Makefile-style comment that autoconf places at the top
	of src/config.h.
	(config_h_opts): Removed - no longer necessary.
	* Makefile.in (configname): Renamed to configuration.
	(CONFIG_CFLAGS): Renamed to DEFS.
	(CC, DEFS, C_SWITCH_SYSTEM, version, configuration): Adjusted to
	get values via autoload @cookies@.
	(libsrc_libs): Get this from autoconf.  We used to do nothing
	about this.
	(${SUBDIR}): Pass DEFS to submakes instead of CONFIG_CFLAGS.

	* Makefile.in (src/paths.h, lib-src/Makefile, src/Makefile): Don't
	echo the move-if-change command.
1993-04-10 06:01:49 +00:00
Jim Blandy
7987a1696f lisp/ * Makefile.in (src/paths.h): Don't echo the huge sed command we
use to build paths.h.
	(lib-src/Makefile, src/Makefile): Similarly.
1993-03-30 21:31:15 +00:00
Jim Blandy
80afd15ee0 Arrange for C compilation throughout the tree to get
C_SWITCH_SYSTEM from the configuration files.
	* configure: Extract C_SWITCH_SYSTEM from the machine and
	system-dependent files, and save it in the top-level Makefile.
	* Makefile.in (C_SWITCH_SYSTEM): New flag for configure to edit.
	(lib-src/Makefile): Edit C_SWITCH_SYSTEM into lib-src/Makefile.
1993-03-25 03:51:20 +00:00
Eric S. Raymond
29c0047b07 Added unlock and relock productions. 1993-03-19 07:37:19 +00:00
Eric S. Raymond
a34902abb8 Added `Developer's configuration' section. 1993-03-17 13:23:14 +00:00
Jim Blandy
2009907027 * Makefile.in (install.sysv): Add a second `$' in front of
`${dest}', so that the shell will expand it, instead of Make.
1993-03-11 06:58:20 +00:00
Jim Blandy
c56516d57a * Makefile.in (install, install.aix, install.xenix, install.sysv):
Remove CVS subdirectories from the installed directory trees, as
	well as RCS directories.
1993-03-02 08:28:24 +00:00
Jim Blandy
ab8478d1f1 * Makefile.in (lisppath): Don't include externallispdir in this.
We're not sure whether we're even going to distribute the
	directory yet.
1993-02-23 11:55:05 +00:00
Jim Blandy
ec054e3328 * Makefile.in (${SUBDIR}): Pass CONFIG_CFLAGS to the submakes, not
CFLAGS.

	* Makefile.in (locallisppath): Make this default to
	${datadir}/emacs/site-lisp, instead of
	${datadir}/emacs/local-lisp.  ${datadir} and ${statedir} are often
	the same thing, and local-lisp causes completion conflicts with
	lock.
	(lisppath): Add ${externallispdir} to this.
	* INSTALL: Adjust installation directions.

	* Makefile.in (externallispdir): New variable, to say where to
	install the externally-maintained lisp files.
	(COPYDIR, COPYDESTS): Copy the external lisp directory just like
	the others.
	* INSTALL: Describe external-lisp and the new externallispdir
	variable.
1993-02-22 14:11:28 +00:00
Jim Blandy
83f6a56577 * Makefile.in (COPYDIR, COPYDESTS): Remove ${srcdir}/info and
${infodir} from these variables; we have written out explicit code
	to install the info files.

	* Makefile.in: Some makes can't handle comments in the middle of
	commands; move them to before the whole rule.
1993-02-14 14:26:06 +00:00
Jim Blandy
dbc4e1c129 JimB's changes since January 18th 1993-01-26 01:58:16 +00:00
Richard M. Stallman
08edea3c96 Define MAKE, and use where appropriate. 1993-01-13 22:20:28 +00:00
Jim Blandy
868e080d41 * INSTALL: The build process produces an executable called `emacs'
now.  Change references.
	* Makefile.in: Adjust `install.mumble' targets to install
	`src/emacs', not `src/xemacs'.

	* Makefile.in (install, install.sysv, install.xenix, install.aix):
	Don't try to copy the info files if there aren't any; the
	unexpanded globbing pattern disappoints `install'.  Ignore the
	return status of that command.
1992-12-24 05:56:33 +00:00
Jim Blandy
78008d140e * Makefile.in (install, install.sysv, install.xenix, install.aix):
Install the info files in ${infodir}.  Install the executable
	under both `emacs' and `emacs-VERSION'.

	* Makefile.in: Doc fix.

	* Makefile.in (exec_prefix): New variable, as per latest version
	of coding standards.
	(bindir, libdir): Use it, instead of `prefix'.
	(lib-src/Makefile): Edit value of exec_prefix into lib-src/Makefile.

	* Makefile.in (mandir): Make the default value for this depend on
	$(prefix).

	* Makefile.in (datadir, statedir, libdir): Make these all default
	to ${prefix}/lib.
	(lispdir, locallisppath, etcdir, lockdir, archlibdir): Adjusted
	to compensate.

	* Makefile.in (install, install.sysv, install.xenix, install.aix):
	Install the etags and ctags man pages too.

	* Makefile.in (distclean): Don't delete backup files; that's the
	job of extraclean.
	(extraclean): Like distclean, but deletes backup and autosave files.

	Make path specification conform to GNU coding standards.
	* configure (long_usage): Remove all traces of old arguments from
	usage messages, and document the options we do accept in more
	detail: -with-x... and --srcdir.
	(options, boolean_opts): Deleted; we don't have enough options to
	make this worthwhile.
	(prefix, bindir, lisppath, datadir, libdir, lockdir): Deleted,
	along with the code which supported them; these should be set as
	arguments to the top-level make.
	(config_h_opts): Since this no longer doubles as a list of option
	names, make them upper case; this simplifies the code which uses
	them to build the sed command to edit src/config.h.  Change the
	code which sets them.
	(cc, g, O): Don't allow the user to set these using options; they
	should be specified using `CC=' and `CFLAGS=' arguments to the
	top-level make.  Just choose reasonable default values for them,
	and edit them into Makefile.in's default CC and CONFIG_CFLAGS
	values.
	(gnu_malloc, rel_alloc): Don't allow the user to set these using
	options; use them whenever the configuration files say they're
	possible.
	Simplify the argument processing loop.  Don't accept abbreviations
	for option names; these might conflict with other configuration
	options in the future.
	Add some support for the `--srcdir' option.  Check for the sources
	in . and .. if `--srcdir' is omitted.  If the directories we will
	compile in don't exist yet, create them under the current directory.
	Note that the rest of the build process doesn't really support
	this.
	Edit only the top Makefile.  That should edit the others.  Edit
	into the makefile: `version', from lisp/version.el, `configname'
	and `srcdir' from the configuration arguments, `CC' and
	`CONFIG_CFLAGS' as guessed from the presence or absence of GCC in
	the user's path, and LOADLIBES as gleaned from the system
	description files.
	Simplify the report generated; it doesn't need to include any
	description of paths now.
	Make `config.status' exec configure instead of just calling it, so
	there's no harm in overwriting `config.status'.
	* Makefile.in (version, configname): New variables, used to choose
	the default values for datadir and libdir.
	Path variables rearranged into two clearer groups:
	- In the first group are the variables specified by the GNU coding
	  standards (prefix, bindir, datadir, statedir, libdir, mandir,
	  manext, infodir, and srcdir).
	- In the second are the variables actually used for Emacs's paths
	  (lispdir, locallisppath, lisppath, buildlisppath, etcdir, lockdir,
	  archlibdir), which depend on the first category.
	datadir and libdir default to directories under
	${prefix}/lib/emacs instead of ${prefix}/emacs, by popular
	demand.
	etcdir and lispdir default to subdirectories of datadir.
	archlibdir defaults to libdir.
	The new installation tree is a bit deeper than it used to be, so
	use the new make-path program in lib-src to build them all.
	Always build a new src/paths.h.tmp and then move-if-change it to
	src/paths.h, to avoid unnecessary rebuilds while responding to the
	right changes.
	Remove all mention of arch-lib.  Run utility commands from
	lib-src, and let the executables be copied into archlibdir when
	Emacs is installed.
	Add targets for src/Makefile, lib-src/Makefile, and
	oldXMenu/Makefile, editing the values of the path variables into
	them.
	Let lib-src do its own installation.
	(datadir): Default to putting data files under
	${prefix}/lib/emacs/${version}, not /usr/local/emacs.
	(emacsdir): Variable deleted; it would only be confusing to use.
	(lispdir, etcdir): Default to ${datadir}/lisp.
	(mkdir): Use make-path for this.
	(lockdir): Do this in mkdir.
	(Makefile): New target.
1992-12-12 15:42:14 +00:00
Jim Blandy
0c22fbcab4 Now partially conforms with GNU coding standards. I'm only checking
it in to RCS so I can check my changes in with FSF Cambridge.
1992-12-06 22:12:37 +00:00
Jim Blandy
e4801b31ff entered into RCS 1992-09-13 10:43:05 +00:00
Jim Blandy
692f9ac6a1 *** empty log message *** 1992-08-27 22:17:59 +00:00
Jim Blandy
dc5a70f1f4 *** empty log message *** 1992-07-07 19:52:34 +00:00
Jim Blandy
4c2232bcb0 *** empty log message *** 1992-06-24 21:56:16 +00:00