diff options
| author | chris <chris@FreeBSD.org> | 1999-11-01 04:29:05 +0000 |
|---|---|---|
| committer | chris <chris@FreeBSD.org> | 1999-11-01 04:29:05 +0000 |
| commit | 79f6318ee43fcbbcce62739cca93e69372f18f50 (patch) | |
| tree | 5a3d0fb697e801f88be1bc6025eafe8841f1eb53 /usr.sbin/mergemaster/Makefile | |
| parent | fca471ec42bada1c90361e23d945d8394aee572d (diff) | |
| download | FreeBSD-src-79f6318ee43fcbbcce62739cca93e69372f18f50.zip FreeBSD-src-79f6318ee43fcbbcce62739cca93e69372f18f50.tar.gz | |
``mergemaster'' was repo-copied to ``mergemaster.sh'' as it's a shell script.
Delete the original mergemaster and modify Makefile to install mergemaster.sh.
Seen no problem with by: billf
No objections by: Doug Barton
Diffstat (limited to 'usr.sbin/mergemaster/Makefile')
| -rw-r--r-- | usr.sbin/mergemaster/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/usr.sbin/mergemaster/Makefile b/usr.sbin/mergemaster/Makefile index 535ab05..c00d180 100644 --- a/usr.sbin/mergemaster/Makefile +++ b/usr.sbin/mergemaster/Makefile @@ -6,7 +6,7 @@ MAN8= mergemaster.8 beforeinstall: ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ - ${.CURDIR}/mergemaster ${DESTDIR}${BINDIR}/mergemaster + ${.CURDIR}/mergemaster.sh ${DESTDIR}${BINDIR}/mergemaster .include <bsd.prog.mk> |
