diff options
| author | Jim Blandy <jimb@redhat.com> | 1993-05-25 06:18:24 +0000 |
|---|---|---|
| committer | Jim Blandy <jimb@redhat.com> | 1993-05-25 06:18:24 +0000 |
| commit | 63f8e51c226d29f3e982780fede84876e274738d (patch) | |
| tree | 6f4cec884bfc72986828d36a8665cf7428c4e7b5 | |
| parent | 93a6ab21c09e033210ad23f6df8b7a24a4649647 (diff) | |
| download | emacs-63f8e51c226d29f3e982780fede84876e274738d.tar.gz | |
* 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.
| -rw-r--r-- | Makefile.in | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 547421a29a6..5861999f8ce 100644 --- a/Makefile.in +++ b/Makefile.in @@ -225,6 +225,7 @@ src/paths.h: Makefile ${srcdir}/src/paths.h.in FRC -e 's;\(#.*PATH_LOADSEARCH\).*$$;\1 "'$${lisppath}'";' \ -e 's;\(#.*PATH_DUMPLOADSEARCH\).*$$;\1 "'$${buildlisppath}'";' \ -e 's;\(#.*PATH_EXEC\).*$$;\1 "${archlibdir}";' \ + -e 's;\(#.*PATH_INFO\).*$$;\1 "${infodir}";' \ -e 's;\(#.*PATH_DATA\).*$$;\1 "${etcdir}";' \ -e 's;\(#.*PATH_LOCK\).*$$;\1 "${lockdir}/";') @${srcdir}/move-if-change src/paths.h.tmp src/paths.h @@ -321,15 +322,21 @@ Makefile: ## place with their files read-only (perhaps because they are checked ## into RCS). In order to make this safe, we make sure that the ## source exists and is distinct from the destination. -install: all mkdir - (cd lib-src; $(MAKE) install ${MFLAGS} bindir=${bindir} libdir=${libdir}) +install: all do-install + +do-install: mkdir + (cd lib-src; \ + $(MAKE) install ${MFLAGS} prefix=${prefix} \ + exec_prefix=${exec_prefix} bindir=${bindir} libdir=${libdir} \ + archlibdir=${archlibdir}) -set ${COPYDESTS} ; \ + rm -rf ${COPYDESTS} ; \ + mkdir ${COPYDESTS} ; \ for dir in ${COPYDIR} ; do \ dest=$$1 ; shift ; \ [ -d $${dir} ] \ && [ `(cd $${dir}; /bin/pwd)` != `(cd $${dest}; /bin/pwd)` ] \ && (echo "Copying $${dir}..." ; \ - rm -rf $${dest} ; mkdir $${dest} ; \ (cd $${dir}; tar cf - . )|(cd $${dest}; umask 0; tar xvf - ); \ for subdir in `find $${dest} -type d ! -name RCS -print` ; do \ rm -rf $${subdir}/RCS ; \ @@ -358,7 +365,8 @@ install: all mkdir ### /usr/local/lib/emacs/19.0/mips-dec-ultrix4.2), we use make-path ### instead of mkdir. Not all systems' mkdirs have the `-p' flag. mkdir: FRC - ./lib-src/make-path ${COPYDESTS} ${lockdir} + ./lib-src/make-path ${COPYDESTS} ${lockdir} ${infodir} ${mandir} \ + ${bindir} ${datadir} ${libdir} ${sitelisp} chmod 777 ${COPYDESTS} ${lockdir} FRC: |