From owner-freebsd-doc Thu Apr 20 5:32:29 2000 Delivered-To: freebsd-doc@freebsd.org Received: from columbus.cris.net (columbus.cris.net [212.110.128.65]) by hub.freebsd.org (Postfix) with ESMTP id C7AEB37BD18; Thu, 20 Apr 2000 05:32:13 -0700 (PDT) (envelope-from phantom@FreeBSD.org.ua) Received: from phantom.cris.net (phantom.cris.net [212.110.130.74]) by columbus.cris.net (8.9.3/8.9.3) with ESMTP id PAA55622; Thu, 20 Apr 2000 15:31:50 +0300 (EEST) Received: (from phantom@localhost) by phantom.cris.net (8.9.3/8.9.3) id PAA28469; Thu, 20 Apr 2000 15:33:30 +0300 (EEST) (envelope-from phantom) Date: Thu, 20 Apr 2000 15:33:30 +0300 From: Alexey Zelkin To: doc@FreeBSD.org, nik@FreeBSD.org Subject: make clean problem (fix included) Message-ID: <20000420153330.A28460@phantom.cris.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="pf9I7BMVVzbSWLtt" X-Mailer: Mutt 1.0.1i X-Operating-System: FreeBSD 4.0-STABLE i386 Sender: owner-freebsd-doc@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org --pf9I7BMVVzbSWLtt Content-Type: text/plain; charset=us-ascii hi, Since makefile's in www/${lang}/tutorials are overriding "clean" make target make(1) do not clean files located in tutorials directory. I wrote simple workaround, but I am looking for more elegant way. Any suggestions ? ps: I made exaple patch for www/en/tutorials/Makefile, but all languages affected. -- /* Alexey Zelkin && phantom@cris.net */ /* Tavric National University && phantom@crimea.edu */ /* http://www.ccssu.crimea.ua/~phantom && phantom@FreeBSD.org */ --pf9I7BMVVzbSWLtt Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="w.p" Index: web.mk =================================================================== RCS file: /home/ncvs/www/en/web.mk,v retrieving revision 1.27 diff -u -r1.27 web.mk --- web.mk 1999/12/23 01:14:35 1.27 +++ web.mk 2000/04/20 12:24:52 @@ -125,6 +125,11 @@ # .if !target(clean) clean: _PROGSUBDIR +.if defined(DIRS_TO_CLEAN) && !empty(DIRS_TO_CLEAN) +.for dir in ${DIRS_TO_CLEAN} + (cd ${dir} && ${MAKE} clean) +.endfor +.endif rm -f Errs errs mklog ${GENDOCS} ${LOCAL} ${CLEANFILES} .endif --pf9I7BMVVzbSWLtt Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="m.p" Index: Makefile =================================================================== RCS file: /home/ncvs/www/en/tutorials/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- Makefile 1999/09/17 23:48:29 1.5 +++ Makefile 2000/04/20 12:21:01 @@ -6,7 +6,11 @@ DOCS = index.sgml -all afterinstall clean: index.html +DIRS_TO_CLEAN = ../../../doc/en_US.ISO_8859-1/articles \ + ../../../doc/en_US.ISO_8859-1/books/fdp-primer \ + ../../../doc/en_US.ISO_8859-1/books/ppp-primer + +all afterinstall: index.html (cd ../../../doc/en_US.ISO_8859-1/articles && ${MAKE} 'FORMATS=html html-split' 'DESTDIR=${DESTDIR}/data/tutorials/$${.CURDIR:T}' ${.TARGET:S/afterinstall/install/}) (cd ../../../doc/en_US.ISO_8859-1/books/fdp-primer && ${MAKE} 'FORMATS=html html-split' DESTDIR=${DESTDIR}/data/tutorials/docproj-primer ${.TARGET:S/afterinstall/install/}) (cd ../../../doc/en_US.ISO_8859-1/books/ppp-primer && ${MAKE} 'FORMATS=html html-split' DESTDIR=${DESTDIR}/data/tutorials/ppp ${.TARGET:S/afterinstall/install/}) --pf9I7BMVVzbSWLtt-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-doc" in the body of the message