git/Makefile.init
author Jan Vrany <jan.vrany@fit.cvut.cz>
Thu, 23 Aug 2018 10:44:42 +0100
changeset 859 d990a97b26a4
parent 490 3570b25fa5c3
permissions -rw-r--r--
Fix parsing og `hg merge` output for Mercurial 4.6 and newer In Mercurial 4.6 the wording of last line of the output has changed. This commit updates the parser so it can handle both wordings.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
490
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     1
#
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     2
# DO NOT EDIT
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     3
#
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     4
# make uses this file (Makefile) only, if there is no
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     5
# file named "makefile" (lower-case m) in the same directory.
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     6
# My only task is to generate the real makefile and call make again.
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     7
# Thereafter, I am no longer used and needed.
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     8
#
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
     9
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    10
.PHONY: run
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    11
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    12
run: makefile
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    13
	$(MAKE) -f makefile
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    14
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    15
#only needed for the definition of $(TOP)
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    16
include Make.proto
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    17
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    18
makefile:
3570b25fa5c3 *** empty log message ***
Claus Gittinger <cg@exept.de>
parents:
diff changeset
    19
	$(TOP)/rules/stmkmf