From 51ae7d1980402217ef06b1c9f6f29aec752c4a48 Mon Sep 17 00:00:00 2001 From: Antonio SJ Musumeci Date: Mon, 14 Dec 2015 23:50:02 -0500 Subject: [PATCH 1/2] change make to work with non-bash shells --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 765c1b88..414f54ec 100644 --- a/Makefile +++ b/Makefile @@ -219,7 +219,7 @@ rpm-clean: rpm: tarball $(eval VERSION := $(shell $(GIT) describe --always --tags --dirty)) $(eval VERSION := $(subst -,_,$(VERSION))) - $(MKDIR) -p rpmbuild/{BUILD,RPMS,SOURCES} + $(MKDIR) -p rpmbuild/BUILD rpmbuild/RPMS rpmbuild/SOURCES $(SED) 's/__VERSION__/$(VERSION)/g' $(TARGET).spec > \ rpmbuild/SOURCES/$(TARGET).spec cp -ar $(TARGET)-$(VERSION).tar.gz rpmbuild/SOURCES From 55c4a326144e1d18e1bb2481bb5000b7e0de14b4 Mon Sep 17 00:00:00 2001 From: Antonio SJ Musumeci Date: Mon, 14 Dec 2015 23:50:35 -0500 Subject: [PATCH 2/2] add artifacts to gitignore --- .gitignore | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.gitignore b/.gitignore index 5c51ed50..7a510743 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,14 @@ *.la *.a +# build artifacts +mergerfs +obj/ +src/version.hpp + # Debian files debian/files debian/changelog + +# RPM files +rpmbuild/