Date: Tue, 11 Mar 2003 00:31:17 +0100 From: "Simon L. Nielsen" <simon@nitro.dk> To: freebsd-doc@freebsd.org Subject: FreeBSD from scratch doesn't work with OBJDIR Message-ID: <20030310233116.GA1251@nitro.dk>
next in thread | raw e-mail | index | archive | help
--7iMSBzlTiPOCCT2k
Content-Type: multipart/mixed; boundary="FCuugMFkClbJLl1L"
Content-Disposition: inline
--FCuugMFkClbJLl1L
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Hello
If the obj directory exists (by doing 'make obj') the FreeBSD from
scrath article breaks the doc build. I have attached a patch that
unbreaks the build and install the shell scripts (stage_[123].sh)
correctly to the destination dir.
Btw. this could be done in a more clean way using FILES (from
bsd.files.mk) but the doc build system does not seem to support this?
The inline versions in the article still don't work with obj directory
but I don't know how to fix that...
--=20
Simon L. Nielsen
--FCuugMFkClbJLl1L
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="doc-fbsd-scract-obj-build.patch"
Content-Transfer-Encoding: quoted-printable
Index: Makefile
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /home/ncvs/doc/en_US.ISO8859-1/articles/fbsd-from-scratch/Makefil=
e,v
retrieving revision 1.1
diff -u -d -r1.1 Makefile
--- Makefile 8 Mar 2003 08:26:10 -0000 1.1
+++ Makefile 10 Mar 2003 23:10:11 -0000
@@ -18,6 +18,8 @@
DOC_PREFIX?=3D ${.CURDIR}/../../..
=20
afterinstall:
- ${INSTALL_DOCS} stage_1.sh stage_2.sh stage_3.mk ${DESTDIR}
+ ${INSTALL_DOCS} ${.CURDIR}/stage_1.sh ${DESTDIR}
+ ${INSTALL_DOCS} ${.CURDIR}/stage_2.sh ${DESTDIR}
+ ${INSTALL_DOCS} ${.CURDIR}/stage_3.mk ${DESTDIR}
=20
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
--FCuugMFkClbJLl1L--
--7iMSBzlTiPOCCT2k
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (FreeBSD)
iD8DBQE+bSBE8kocFXgPTRwRAlgoAJ9bHa+oltgDpzV6Soq056XUSWU/6gCcDH89
CtbH6PeDxAHCpows/GNLlDU=
=ZxY0
-----END PGP SIGNATURE-----
--7iMSBzlTiPOCCT2k--
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-doc" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030310233116.GA1251>