From 897c187786a00b353dc0333e00b6b570d245f0ef Mon Sep 17 00:00:00 2001 From: Andrew Hlynskyi Date: Mon, 21 Aug 2023 05:19:20 +0300 Subject: [PATCH] fix: `make install` should install files with default perms --- .gitignore | 1 + Makefile | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 5a17dd9b..53550dd7 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ log*.html fuzz-results +/tree-sitter.pc test/fixtures/grammars/* !test/fixtures/grammars/.gitkeep package-lock.json diff --git a/Makefile b/Makefile index be915fa3..a11214d5 100644 --- a/Makefile +++ b/Makefile @@ -55,18 +55,22 @@ ifneq ($(STRIP),) endif install: all - install -d '$(DESTDIR)$(LIBDIR)' - install -m755 libtree-sitter.a '$(DESTDIR)$(LIBDIR)'/libtree-sitter.a - install -m755 libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER) - ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR) - ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT) - install -d '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter - install -m644 lib/include/tree_sitter/*.h '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter/ - install -d '$(DESTDIR)$(PCLIBDIR)' sed -e 's|@LIBDIR@|$(LIBDIR)|;s|@INCLUDEDIR@|$(INCLUDEDIR)|;s|@VERSION@|$(VERSION)|' \ -e 's|=$(PREFIX)|=$${prefix}|' \ -e 's|@PREFIX@|$(PREFIX)|' \ - tree-sitter.pc.in > '$(DESTDIR)$(PCLIBDIR)'/tree-sitter.pc + tree-sitter.pc.in > tree-sitter.pc + + install -d '$(DESTDIR)$(LIBDIR)' + install -m644 -t '$(DESTDIR)$(LIBDIR)' libtree-sitter.a + install -m755 -t '$(DESTDIR)$(LIBDIR)' libtree-sitter.$(SOEXTVER) + ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXTVER_MAJOR) + ln -sf libtree-sitter.$(SOEXTVER) '$(DESTDIR)$(LIBDIR)'/libtree-sitter.$(SOEXT) + + install -d '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter + install -m644 -t '$(DESTDIR)$(INCLUDEDIR)'/tree_sitter lib/include/tree_sitter/*.h + + install -d '$(DESTDIR)$(PCLIBDIR)' + install -m644 -t '$(DESTDIR)$(PCLIBDIR)' tree-sitter.pc clean: rm -f lib/src/*.o libtree-sitter.a libtree-sitter.$(SOEXT) libtree-sitter.$(SOEXTVER_MAJOR) libtree-sitter.$(SOEXTVER)