diff --git a/.gitignore b/.gitignore index 5c51ed50..2c558de3 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,8 @@ # Debian files debian/files debian/changelog + +# ignore build artifacts +obj/ +rpmbuild/ +src/version.hpp diff --git a/Makefile b/Makefile index 765c1b88..99b752c0 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,SOURCES rpmbuild/SOURCES $(SED) 's/__VERSION__/$(VERSION)/g' $(TARGET).spec > \ rpmbuild/SOURCES/$(TARGET).spec cp -ar $(TARGET)-$(VERSION).tar.gz rpmbuild/SOURCES diff --git a/src/fs_xattr.cpp b/src/fs_xattr.cpp index 16f6f8f5..f279513e 100644 --- a/src/fs_xattr.cpp +++ b/src/fs_xattr.cpp @@ -24,7 +24,10 @@ #include #include +#ifndef WITHOUT_XATTR #include +#endif +#include #include #include #include diff --git a/src/getxattr.cpp b/src/getxattr.cpp index 2e511e76..8b727d3b 100644 --- a/src/getxattr.cpp +++ b/src/getxattr.cpp @@ -62,7 +62,7 @@ _lgetxattr(const string &path, return ((rv == -1) ? -errno : rv); #else - return -ENOSUP; + return -ENOTSUP; #endif }