Mercurial > hg > xemacs-beta
changeset 598:6452bb72f5b9
[xemacs-hg @ 2001-06-01 05:07:19 by martinb]
make distclean fails when blddir != srcdir
| author | martinb |
|---|---|
| date | Fri, 01 Jun 2001 05:07:20 +0000 |
| parents | ce085c4b3999 |
| children | 55614ee2fb8d |
| files | ChangeLog Makefile.in.in |
| diffstat | 2 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jun 01 05:06:15 2001 +0000 +++ b/ChangeLog Fri Jun 01 05:07:20 2001 +0000 @@ -1,3 +1,10 @@ +2001-05-29 Martin Buchholz <martin@xemacs.org> + + * Makefile.in.in: `make distclean' would fail if srcdir != blddir. + Remove SUBDIR_DISTCLEAN until such a time as the module subdir is + properly integrated into the build system. + Only create ${moduledir} and ${sitemoduledir} if HAVE_SHLIB. + 2001-05-30 Ben Wing <ben@xemacs.org> * configure.in (AC_INIT_PARSE_ARGS):
--- a/Makefile.in.in Fri Jun 01 05:06:15 2001 +0000 +++ b/Makefile.in.in Fri Jun 01 05:07:20 2001 +0000 @@ -225,9 +225,6 @@ ## Subdirectories that can be made recursively. SUBDIR = ${MAKE_SUBDIR} man -## Subdirectories that must be cleaned on distclean -SUBDIR_DISTCLEAN = ${SUBDIR} modules/sample modules/ldap modules/zlib modules/base64 - ## The makefiles of the directories in ${MAKE_SUBDIR}. SUBDIR_MAKEFILES = @SUBDIR_MAKEFILES@ @@ -492,7 +489,10 @@ mkdir: FRC.mkdir ${MAKEPATH} ${COPYDESTS} ${docdir} ${infodir} ${archlibdir} \ ${mandir} ${bindir} ${datadir} ${libdir} ${pkgdir} \ - ${sitelispdir} ${moduledir} ${sitemoduledir} +#ifdef HAVE_SHLIB + ${moduledir} ${sitemoduledir} \ +#endif + ${sitelispdir} ## Delete all the installed files that the `install' target would ## create (but not the noninstalled files such as `make all' would @@ -564,7 +564,7 @@ $(RM) -r site-packages xemacs-packages mule-packages site-lisp distclean: FRC.distclean - for d in $(SUBDIR_DISTCLEAN); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done + for d in $(SUBDIR); do (cd ./$$d && $(RECURSIVE_MAKE) $@); done -${top_distclean} ## `realclean'