Does the word "make" have the same definition in the next two sentences?

Make merry.

He made as if to punch him, but they both laughed and shook hands.
the same meaning