diff --git a/dotfiles.mk b/dotfiles.mk index 92e35a1..94db45e 100644 --- a/dotfiles.mk +++ b/dotfiles.mk @@ -45,21 +45,20 @@ install: reverse: @$(MAKE) -s -C ../ reverse uninstall: - @$(MAKE) -C ../ uninstall + @$(MAKE) -s -C ../ uninstall endif $(modules): %: - @echo $(MAKEFILES) - @$(MAKE) -C $* + $(MAKE) -C $* $(install-objects): install-%: % @$(if $(call newer,$*), \ - echo -e "$(FG_GRE)installing $(FG_YEL)$* $(CLR_RE)to $(DESTDIR) as $(MODE)"; \ + echo -e "$(FG_GRE)installing $(FG_YEL)$(MKDPREFIX)$* $(CLR_RE)to $(DESTDIR) as $(MODE)"; \ install -pDm $(MODE) "$*" "$(DESTDIR)/$*", \ - echo -e "$(FG_RED)not installing $(FG_YEL)$*$(CLR_RE)") + echo -e "$(FG_RED)not installing $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)") $(install-modules): install-%: - @$(MAKE) -s -C $* install + @$(MAKE) -s -C $* install MKDPREFIX=$(MKDPREFIX)$*/ $(reverse-objects): reverse-%: @$(if $(call older,$*), \ @@ -68,26 +67,26 @@ $(reverse-objects): reverse-%: echo -e "$(FG_RED)not reversing $(FG_YEL)$*$(CLR_RE)") $(reverse-modules): reverse-%: - @$(MAKE) -s -C $* reverse + @$(MAKE) -s -C $* reverse MKDPREFIX=$(MKDPREFIX)$*/ $(uninstall-objects): uninstall-%: @$(if $(call older,$*), \ - echo -e "$(FG_RED)not uninstalling $(FG_YEL)$*$(CLR_RE)", \ - echo -e "$(FG_GRE)uninstalling $(FG_YEL)$*$(CLR_RE)"; \ + echo -e "$(FG_RED)not uninstalling $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)", \ + echo -e "$(FG_GRE)uninstalling $(FG_YEL)$(MKDPREFIX)$*$(CLR_RE)"; \ rm -f "$(DESTDIR)/$*") $(uninstall-modules): uninstall-%: - @$(MAKE) -C $* uninstall + @$(MAKE) -C $* uninstall MKDPREFIX=$(MKDPREFIX)$*/ $(check-objects): check-%: @$(if $(call newer,$*), \ - echo -e "$(FG_YEL)$* $(FG_GRE)newer$(CLR_RE) than $(DESTDIR)$*!", \ + echo -e "$(FG_YEL)$(MKDPREFIX)$* $(FG_GRE)newer$(CLR_RE) than $(DESTDIR)$*!", \ $(if $(call older,$*), \ - echo -e "$(FG_YEL)$* $(FG_RED)older$(CLR_RE) than $(DESTDIR)$*.", \ - echo -e "$(FG_YEL)$* $(FG_BLU)up to date$(CLR_RE) with $(DESTDIR)$*.")) + echo -e "$(FG_YEL)$(MKDPREFIX)$* $(FG_RED)older$(CLR_RE) than $(DESTDIR)$*.", \ + echo -e "$(FG_YEL)$(MKDPREFIX)$* $(FG_BLU)up to date$(CLR_RE) with $(DESTDIR)$*.")) $(check-modules): check-%: - @$(MAKE) -s -C $* check + @$(MAKE) -s -C $* check MKDPREFIX=$(MKDPREFIX)$*/ $(filter %.elc,$(objects)): %.elc: %.el $(call compile,$^)