Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Feb 1996 14:35:31 +0100
From:      Wolfram Schneider <wosch@cs.tu-berlin.de>
To:        Bruce Evans <bde@zeta.org.au>
Cc:        current@freebsd.org
Subject:   Re: chown in bsd.doc.mk and bsd.info.mk
Message-ID:  <199602071335.OAA15752@gundula.cs.tu-berlin.de>
In-Reply-To: <199601310201.NAA06888@godzilla.zeta.org.au>
References:  <199601310201.NAA06888@godzilla.zeta.org.au>

next in thread | previous in thread | raw e-mail | index | archive | help
Bruce Evans writes:
>Actually, the chown shouldn't be there at all.  The directory should
>be created by mtree, not by `mkdir -p' in the Makefile.
>
>bsd.prog.mk has a silly `chown games.bin' of a symlink.  chown(8) is
>now a no-op.

Here is the patch. Please test if make realinstall works (it should).

Wolfram


--- 1.1	1996/02/06 15:18:51
+++ bsd.doc.mk	1996/02/06 16:28:02
@@ -88,21 +88,13 @@
 
 clean:
 	rm -f ${DOC}.${PRINTER} ${DOC}.ps ${DOC}.ascii \
-		${DOC}.ps.gz ${DOC}.ascii.gz [eE]rrs mklog ${CLEANFILES}
+		${DOC}.ps.gz ${DOC}.ascii.gz Errs errs mklog ${CLEANFILES}
 
 cleandir: clean
 	cd ${.CURDIR}; rm -rf obj
 
 FILES?=	${SRCS}
 realinstall:
-	@if [ ! -d "${DESTDIR}${BINDIR}/${VOLUME}" ]; then \
-                /bin/rm -f ${DESTDIR}${BINDIR}/${VOLUME}  ; \
-                mkdir -p ${DESTDIR}${BINDIR}/${VOLUME}  ; \
-                chown root.wheel ${DESTDIR}${BINDIR}/${VOLUME}  ; \
-                chmod 755 ${DESTDIR}${BINDIR}/${VOLUME}  ; \
-        else \
-                true ; \
-        fi
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${DFILE} ${DESTDIR}${BINDIR}/${VOLUME}
 
--- 1.1	1996/02/06 15:18:51
+++ bsd.info.mk	1996/02/06 15:40:25
@@ -66,20 +66,12 @@
 .endif
 
 clean:
-	rm -f ${INFO:S/$/.info*/g} [eE]rrs mklog ${CLEANFILES}
+	rm -f ${INFO:S/$/.info*/g} Errs errs mklog ${CLEANFILES}
 
 cleandir: clean
 	cd ${.CURDIR}; rm -rf obj
 
 install:
-	@if [ ! -d "${DESTDIR}${BINDIR}" ]; then \
-		/bin/rm -f ${DESTDIR}${BINDIR}  ; \
-		mkdir -p ${DESTDIR}${BINDIR}  ; \
-		chown root.wheel ${DESTDIR}${BINDIR}  ; \
-		chmod 755 ${DESTDIR}${BINDIR}  ; \
-        else \
-                true ; \
-        fi
 	${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \
 		${IFILES} ${DESTDIR}${BINDIR}
 
--- 1.1	1996/02/06 15:18:51
+++ bsd.kmod.mk	1996/02/06 15:24:01
@@ -74,13 +74,13 @@
 
 .if !target(clean)
 clean: _PROGSUBDIR
-	rm -f a.out [Ee]rrs mklog ${PROG} ${OBJS} ${CLEANFILES} 
+	rm -f a.out Errs errs mklog ${PROG} ${OBJS} ${CLEANFILES} 
 .endif
 
 .if !target(cleandir)
 cleandir: _PROGSUBDIR
-	rm -f a.out [Ee]rrs mklog ${PROG} ${OBJS} ${CLEANFILES}
-	rm -f ${.CURDIR}/tags .depend
+	rm -f a.out [Ee]rrs mklog ${PROG} ${OBJS} ${CLEANFILES} \
+		${.CURDIR}/tags .depend
 	cd ${.CURDIR}; rm -rf obj;
 .endif
 
--- 1.1	1996/02/06 15:18:51
+++ bsd.prog.mk	1996/02/06 15:41:45
@@ -138,13 +138,13 @@
 
 .if !target(clean)
 clean: _PROGSUBDIR
-	rm -f a.out [Ee]rrs mklog ${PROG} ${OBJS} ${CLEANFILES} 
+	rm -f a.out Errs errs mklog ${PROG} ${OBJS} ${CLEANFILES} 
 .endif
 
 .if !target(cleandir)
 cleandir: _PROGSUBDIR
-	rm -f a.out [Ee]rrs mklog ${PROG} ${OBJS} ${CLEANFILES}
-	rm -f ${.CURDIR}/tags .depend
+	rm -f a.out Errs errs mklog ${PROG} ${OBJS} ${CLEANFILES} \
+		${.CURDIR}/tags .depend
 	cd ${.CURDIR}; rm -rf obj;
 .endif
 
@@ -162,8 +162,7 @@
 	    ${INSTALLFLAGS} ${PROG} ${DESTDIR}${BINDIR}
 .endif
 .if defined(HIDEGAME)
-	(cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG}; \
-	    chown games.bin ${PROG})
+	(cd ${DESTDIR}/usr/games; rm -f ${PROG}; ln -s dm ${PROG})
 .endif
 .if defined(LINKS) && !empty(LINKS)
 	@set ${LINKS}; \
--- 1.1	1996/02/06 15:18:51
+++ bsd.sgml.mk	1996/02/06 15:23:26
@@ -50,7 +50,7 @@
 .endif
 
 clean: ${FORMATS:S/^/clean-/g}
-	rm -f [eE]rrs mklog
+	rm -f Errs errs mklog
 
 cleandir: clean
 	cd ${.CURDIR}; rm -rf obj




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199602071335.OAA15752>