# Makefile for p4tkmerge PERL = /usr/local/bin/perl P4 = p4 TKDIFF = tkdiff DIFF3 = diff3 # Installation targets: PREFIX = /usr/local INSTALLBIN = $(PREFIX)/bin INSTALLMAN = $(PREFIX)/man INSTALLMAN1DIR = $(INSTALLMAN)/man1 # Identity: NAME = p4tkmerge VERSION = 0.05 DISTNAME = $(NAME) DIST = README Makefile $(NAME).in all: $(NAME) $(NAME).1 $(NAME): $(NAME).in sed -e 's|@@Perl@@|$(PERL)|g' -e 's|@@Name@@|$(NAME)|g' \ -e 's|@@Version@@|$(VERSION)|g' -e 's|@@P4@@|$(P4)|g' \ -e 's|@@Tkdiff@@|$(TKDIFF)|g' -e 's|@@Diff3@@|$(DIFF3)|g' $< > $@ chmod +x $@ $(NAME).1: $(NAME) pod2man $< $(NAME).1 install: $(MAKE) all install -d $(INSTALLBIN) install -c $(NAME) $(INSTALLBIN) install -d $(INSTALLMAN1DIR) install -c $(NAME).1 $(INSTALLMAN1DIR) dist: ln -s . $(DISTNAME)-$(VERSION) tar cvf $(DISTNAME)-$(VERSION).tar $(DIST:%=$(DISTNAME)-$(VERSION)/%) $(RM) $(DISTNAME)-$(VERSION) gzip $(DISTNAME)-$(VERSION).tar clean: $(RM) $(NAME) $(NAME).1
# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#4 | 2071 | anders_johnson | Release p4tkmerge-0.05 | ||
#3 | 1865 | anders_johnson | Version 0.04 | ||
#2 | 1839 | anders_johnson |
p4tkmerge 0.03. Works with older versions of diff3. Fixed a rev parsing bug. |
||
#1 | 1780 | anders_johnson | p4checkpoint-0.03, p4tkd-0.01, p4tkmerge-0.02 |