Skip to content

Makefile: Remove crystal from DATADIR #15467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
straight-shoota merged 2 commits into from
Feb 21, 2025
Merged

Makefile: Remove crystal from DATADIR #15467

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5972a5a
Makefile: Remove `crystal` from DATADIR
straight-shoota Feb 5, 2025
24aad09
Reorder var declaration
straight-shoota Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,9 @@ CRYSTAL_BIN := crystal$(EXE)
DESTDIR ?=
PREFIX ?= /usr/local
BINDIR ?= $(PREFIX)/bin
MANDIR ?= $(PREFIX)/share/man
LIBDIR ?= $(PREFIX)/lib
DATADIR ?= $(PREFIX)/share/crystal
DATADIR ?= $(PREFIX)/share
Comment thread
ysbaddaden marked this conversation as resolved.
MANDIR ?= $(DATADIR)/man
INSTALL ?= /usr/bin/install

ifeq ($(or $(TERM),$(TERM),dumb),dumb)
Expand Down Expand Up @@ -167,21 +167,21 @@ install: $(O)/$(CRYSTAL_BIN) man/crystal.1.gz ## Install the compiler at DESTDIR
$(INSTALL) -d -m 0755 "$(DESTDIR)$(BINDIR)/"
$(INSTALL) -m 0755 "$(O)/$(CRYSTAL_BIN)" "$(DESTDIR)$(BINDIR)/$(CRYSTAL_BIN)"

$(INSTALL) -d -m 0755 $(DESTDIR)$(DATADIR)
cp -R -p $(if $(deref_symlinks),-L,-P) src "$(DESTDIR)$(DATADIR)/src"
rm -rf "$(DESTDIR)$(DATADIR)/$(LLVM_EXT_OBJ)" # Don't install llvm_ext.o
$(INSTALL) -d -m 0755 $(DESTDIR)$(DATADIR)/crystal
cp -R -p $(if $(deref_symlinks),-L,-P) src "$(DESTDIR)$(DATADIR)/crystal/src"
rm -rf "$(DESTDIR)$(DATADIR)/crystal/$(LLVM_EXT_OBJ)" # Don't install llvm_ext.o

$(INSTALL) -d -m 0755 "$(DESTDIR)$(MANDIR)/man1/"
$(INSTALL) -m 644 man/crystal.1.gz "$(DESTDIR)$(MANDIR)/man1/crystal.1.gz"
$(INSTALL) -d -m 0755 "$(DESTDIR)$(PREFIX)/share/licenses/crystal/"
$(INSTALL) -m 644 LICENSE "$(DESTDIR)$(PREFIX)/share/licenses/crystal/LICENSE"
$(INSTALL) -d -m 0755 "$(DESTDIR)$(DATADIR)/licenses/crystal/"
$(INSTALL) -m 644 LICENSE "$(DESTDIR)$(DATADIR)/licenses/crystal/LICENSE"

$(INSTALL) -d -m 0755 "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/"
$(INSTALL) -m 644 etc/completion.bash "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/crystal"
$(INSTALL) -d -m 0755 "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/"
$(INSTALL) -m 644 etc/completion.zsh "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/_crystal"
$(INSTALL) -d -m 0755 "$(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/"
$(INSTALL) -m 644 etc/completion.fish "$(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/crystal.fish"
$(INSTALL) -d -m 0755 "$(DESTDIR)$(DATADIR)/bash-completion/completions/"
$(INSTALL) -m 644 etc/completion.bash "$(DESTDIR)$(DATADIR)/bash-completion/completions/crystal"
$(INSTALL) -d -m 0755 "$(DESTDIR)$(DATADIR)/zsh/site-functions/"
$(INSTALL) -m 644 etc/completion.zsh "$(DESTDIR)$(DATADIR)/zsh/site-functions/_crystal"
$(INSTALL) -d -m 0755 "$(DESTDIR)$(DATADIR)/fish/vendor_completions.d/"
$(INSTALL) -m 644 etc/completion.fish "$(DESTDIR)$(DATADIR)/fish/vendor_completions.d/crystal.fish"

ifeq ($(WINDOWS),1)
.PHONY: install_dlls
Expand All @@ -194,14 +194,14 @@ endif
uninstall: ## Uninstall the compiler from DESTDIR
rm -f "$(DESTDIR)$(BINDIR)/$(CRYSTAL_BIN)"

rm -rf "$(DESTDIR)$(DATADIR)/src"
rm -rf "$(DESTDIR)$(DATADIR)/crystal/src"

rm -f "$(DESTDIR)$(MANDIR)/man1/crystal.1.gz"
rm -f "$(DESTDIR)$(PREFIX)/share/licenses/crystal/LICENSE"
rm -f "$(DESTDIR)$(DATADIR)/licenses/crystal/LICENSE"

rm -f "$(DESTDIR)$(PREFIX)/share/bash-completion/completions/crystal"
rm -f "$(DESTDIR)$(PREFIX)/share/zsh/site-functions/_crystal"
rm -f "$(DESTDIR)$(PREFIX)/share/fish/vendor_completions.d/crystal.fish"
rm -f "$(DESTDIR)$(DATADIR)/bash-completion/completions/crystal"
rm -f "$(DESTDIR)$(DATADIR)/zsh/site-functions/_crystal"
rm -f "$(DESTDIR)$(DATADIR)/fish/vendor_completions.d/crystal.fish"

.PHONY: install_docs
install_docs: docs ## Install docs at DESTDIR
Expand Down