Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2c75551a026ee02efd8127084f6f21e2327886a9 https://github.com/galaxyproject/galaxy/commit/2c75551a026ee02efd8127084f6f2... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-08-01 (Mon, 01 Aug 2016) Changed paths: M Makefile Log Message: ----------- Fix sed usage in Makefile to be compatible with both gnu and bsd sed. -i's argument is not optional for bsd, but an empty string (no backup extension) works fine and has the same behavior as gnu sed. Commit: 00e41385d75f83bbb35abc5830e3859715a2039e https://github.com/galaxyproject/galaxy/commit/00e41385d75f83bbb35abc5830e38... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-08-01 (Mon, 01 Aug 2016) Changed paths: M Makefile Log Message: ----------- The previous approach to sed worked great on bsd sed, but gnu sed doesn't understand an empty '' in-place extension the same way. So, fixed one, broke the other. This approach with the -e argument feels like a total hack since it explits the fact that bsd sed consumes the -e as the argument to -i, but it still has the command interpreted correctly. Commit: ef0d27d677b482d81b89d843cc06d46048a08d03 https://github.com/galaxyproject/galaxy/commit/ef0d27d677b482d81b89d843cc06d... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2016-08-01 (Mon, 01 Aug 2016) Changed paths: M Makefile Log Message: ----------- Change extension of the file that gets immediately deleted to address nsoranzo's concern about bsd utilities. Commit: 6db43585c16c22bb28f5e19c4e1db49444c7971d https://github.com/galaxyproject/galaxy/commit/6db43585c16c22bb28f5e19c4e1db... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-08-01 (Mon, 01 Aug 2016) Changed paths: M Makefile Log Message: ----------- Merge pull request #2695 from dannon/sed_compat sed bsd compatibility for release versioning in Makefile Compare: https://github.com/galaxyproject/galaxy/compare/3fd0e405fd6c...6db43585c16c