diff options
author | gjb <gjb@FreeBSD.org> | 2013-10-09 17:07:20 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2013-10-09 17:07:20 +0000 |
commit | c5342bffee8407caeac0b651549206d534dfccb9 (patch) | |
tree | ca04a5cf90c8299963a38ecf5beb3ec437b5f1b1 /gnu/usr.bin/rcs/rcsmerge/Makefile | |
parent | b33524a23e69ae8f48928d5b941a9a25a4609f30 (diff) | |
download | FreeBSD-src-c5342bffee8407caeac0b651549206d534dfccb9.zip FreeBSD-src-c5342bffee8407caeac0b651549206d534dfccb9.tar.gz |
Revert r256095, r256120 (partial), r256121:
r256095:
- Add gnu/usr.bin/rcs back to the base system.
r256120:
- Add WITHOUT_RCS back to src.conf.5.
r256121:
- Remove UPDATING entry regarding gnu/usr.bin/rcs removal.
Requested by: many
Approved by: re (marius)
Discussed with: core
Diffstat (limited to 'gnu/usr.bin/rcs/rcsmerge/Makefile')
-rw-r--r-- | gnu/usr.bin/rcs/rcsmerge/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/gnu/usr.bin/rcs/rcsmerge/Makefile b/gnu/usr.bin/rcs/rcsmerge/Makefile new file mode 100644 index 0000000..9fd8afa --- /dev/null +++ b/gnu/usr.bin/rcs/rcsmerge/Makefile @@ -0,0 +1,8 @@ +PROG= rcsmerge +SRCS= rcsmerge.c +CFLAGS+= -I${.CURDIR}/../lib +LDADD= ${LIBRCS} +DPADD= ${LIBRCS} + +.include "../../Makefile.inc" +.include <bsd.prog.mk> |