diff options
| author | Matt Singleton <matt@xcolour.net> | 2024-05-31 14:13:01 -0500 |
|---|---|---|
| committer | Matt Singleton <matt@xcolour.net> | 2024-05-31 14:13:01 -0500 |
| commit | c8dea64ee21c16b35c2a8b4982806984daba3273 (patch) | |
| tree | b09c8d38be1b5fa37b0a8259838b8cf2f7341e98 | |
| parent | 6e58f570e296a04d8bbcc37debc5cccc48fae414 (diff) | |
simplify makefile
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | README.md | 11 |
2 files changed, 9 insertions, 14 deletions
@@ -1,21 +1,15 @@ REPO_CHANGES := $(shell git status --porcelain | wc -l) -DEV_MODE := 0 IS_FEDORA := $(shell command -v dnf > /dev/null && test -f /etc/fedora-release; echo $$?) -.PHONY: .initialize -.initialize: +.PHONY: console +console: ifneq ($(REPO_CHANGES),0) -ifeq ($(DEV_MODE),0) - $(error will not run with a dirty repo. stash or commit changes, or re-run with DEV_MODE=1.) -endif + $(error will not run with a dirty repo. stash or commit changes, or re-run forcing REPO_CHANGES=0.) endif git submodule update --init --recursive cp --update=none local/vimrc-local stow/vim/.vimrc-local cp --update=none local/gitconfig-local stow/git/.config/git/config-local cp --update=none local/local.zsh stow/zsh/.config/zsh/00-local.zsh - -.PHONY: console -console: .initialize stow --adopt --dir=stow --target=$(HOME) console-utils stow --adopt --dir=stow --target=$(HOME) dircolors stow --adopt --dir=stow --target=$(HOME) git @@ -1,14 +1,15 @@ Manages dotfiles with stow and make. Make targets: + * `console`: configs for os-independent cli tools * `fedora-packages`: install rpmfusion and fedora packages (standalone, should only need to be run once unless new packages or repos are added) * `fedora`: configs for fedora-specific gui tools (depends on `console`) * `restore`: restore committed versions of files in `stow\` and `sway-de/` -Note: stow is run with the `--adopt` option, which will overwrite files in the -stow directory with the version that would be replaced with a symlink. You can -do a `git diff` to see the differences and if you don't care about them you can -quickly revert to the committed versions with `make restore`. Makefile will do -it's best to abort if there are uncommitted changes in the repo. +Note: Stow is run with the `--adopt` option (see [Invoking +Stow](https://www.gnu.org/software/stow/manual/html_node/Invoking-Stow.html). +You can do a `git diff` to see the differences and if you don't care about them +you can quickly revert to the committed versions with `make restore`. Makefile +will do it's best to abort if there are uncommitted changes in the repo. |