# # # patch "Makefile" # from [9e00a714809bb52983da5f1d34790d1727a4472f] # to [aed5ef474914db48c7a0142d30ece43e23419f66] # ============================================================ --- Makefile 9e00a714809bb52983da5f1d34790d1727a4472f +++ Makefile aed5ef474914db48c7a0142d30ece43e23419f66 @@ -105,7 +105,7 @@ REVISION_FILE := $(shell test -r _MTN/re $(EXTLIB)/unzip.% : MLFLAGS += -w y REVISION_FILE := $(shell test -r _MTN/revision && echo _MTN/revision) -REVISION_ID = $(shell mtn automate get_base_revision_id || ( test -r _MTN/revision && cat _MTN/revision )) +REVISION_ID = $(shell mtn automate get_base_revision_id || ( test -r _MTN/revision && ( if grep format_version _MTN/revision; then grep old_revision _MTN/revision | sed -e 's/^old_revision \[//' -e 's/\] *$//'; else cat _MTN/revision; di ))) version.ml : version.ml.in $(REVISION_FILE) sed -e 's/@REVISION@/$(REVISION_ID)/' -e 's/@VERSION@/$(VERSION)/' < $< > $@