From 3d7506dd73a5785b9f969fff2bea879454e4d709 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 28 Mar 2010 22:58:16 -0400 Subject: builds, cleans, installs, and uninstalls correctly! Now just to make sure it works! --- rvs/plugins/main.mk.in | 3 +++ rvs/plugins/plugin.mk.in | 5 +++-- rvs/plugins/users/info.mk.in | 1 + 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'rvs/plugins') diff --git a/rvs/plugins/main.mk.in b/rvs/plugins/main.mk.in index 01ec205..677ffe6 100644 --- a/rvs/plugins/main.mk.in +++ b/rvs/plugins/main.mk.in @@ -27,6 +27,7 @@ dirs += $(sysconfdir) $(BINDIR) $(TMPDIR) $(LIBDIR) $(ETCDIR) mods = $(patsubst ./%,%,$(shell find ./* -maxdepth 0 -type d)) mods-build = $(addprefix build-,$(mods)) mods-install = $(addprefix install-,$(mods)) +mods-uninstall = $(addprefix uninstall-,$(mods)) mods-clean = $(addprefix clean-,$(mods)) mods-distclean = $(addprefix distclean-,$(mods)) @@ -37,6 +38,7 @@ all : build # $(mods-build) $(mods-install) $(mods-clean) $(mods-distclean) build : $(mods-build) install : $(mods-install) +uninstall : $(mods-uninstall) clean : $(mods-clean) distclean : $(mods-distclean) $(RM) Makefile *.mk @@ -48,6 +50,7 @@ distclean : $(mods-distclean) complete-% : %/ %/main.mk; : build-% : %/ complete-% %/main.mk; $(MAKE) -C $< install-% : %/ complete-% %/main.mk; $(MAKE) -C $< install +uninstall-% : %/ complete-% %/main.mk; $(MAKE) -C $< uninstall clean-% : %/ complete-% %/main.mk; -$(MAKE) -C $< clean distclean-% : %/ complete-% %/main.mk; $(MAKE) -C $< distclean diff --git a/rvs/plugins/plugin.mk.in b/rvs/plugins/plugin.mk.in index 1f1995c..f8a42b4 100644 --- a/rvs/plugins/plugin.mk.in +++ b/rvs/plugins/plugin.mk.in @@ -66,8 +66,9 @@ $(outLib) : $(LIBDIR)/$(name)/% : lib/% $(MKDIR) $(dir $@) $(INSTALL_DATA) $< $@ -uninstall : - $(RVS) uninstall $(name) +uninstall : $(addprefix un,$(outBin)) + $(RM) -r $(ETCDIR)/$(name) + $(RM) -r $(LIBDIR)/$(name) # clean ############################################################ diff --git a/rvs/plugins/users/info.mk.in b/rvs/plugins/users/info.mk.in index 8289128..094f2a5 100644 --- a/rvs/plugins/users/info.mk.in +++ b/rvs/plugins/users/info.mk.in @@ -1,2 +1,3 @@ name = users ver = 0.9 +priority = 2 -- cgit v1.2.3-2-g168b