summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2013-07-30 11:42:38 +0200
committerTobias Klauser <tklauser@distanz.ch>2013-07-30 11:42:38 +0200
commit27842082e09359b3b7f5eed59ab21a0a06c5b1d2 (patch)
tree339c07ade4969a53974774b433873ffed8bbd5db
parenta1faf28cf0e6869e8588809fbd976c23a510c943 (diff)
build: Don't uninstall configuration files
Several of the tools install/uninstall files from $NCONF_FILES, however if we call the uninstall target for a specific tool (e.g. `make astraceroute_uninstall') but other tools depending on one or more of the config files are still installed, the file is still removed unconditionally. As it would require quite some logic in the Makefile in order to detect installed tools and their dependencies, we just don't uninstall the configuration files anymore. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
-rw-r--r--Extra12
-rw-r--r--Makefile1
2 files changed, 0 insertions, 13 deletions
diff --git a/Extra b/Extra
index 021e4f6..27a3c55 100644
--- a/Extra
+++ b/Extra
@@ -18,15 +18,3 @@ trafgen_install_custom:
astraceroute_install_custom:
$(Q)$(call INST,geoip.conf,$(ETCDIRE))
-
-netsniff-ng_uninstall_custom flowtop_uninstall_custom:
- $(Q)$(foreach file,$(NCONF_FILES),$(call RM,$(ETCDIRE)/$(file));)
- $(Q)$(call RMDIR,$(ETCDIRE))
-
-trafgen_uninstall_custom:
- $(Q)$(call RM,$(ETCDIRE)/stddef.h)
- $(Q)$(call RMDIR,$(ETCDIRE))
-
-astraceroute_uninstall_custom:
- $(Q)$(call RM,$(ETCDIRE)/geoip.conf)
- $(Q)$(call RMDIR,$(ETCDIRE))
diff --git a/Makefile b/Makefile
index 5a467c4..4dda0f8 100644
--- a/Makefile
+++ b/Makefile
@@ -150,7 +150,6 @@ install_all: $(foreach tool,$(TOOLS),$(tool)_install)
install_allbutcurvetun: $(foreach tool,$(filter-out curvetun,$(TOOLS)),$(tool)_install)
install_allbutmausezahn: $(foreach tool,$(filter-out mausezahn,$(TOOLS)),$(tool)_install)
uninstall: $(foreach tool,$(TOOLS),$(tool)_uninstall)
- $(Q)$(call RMDIR,$(ETCDIRE))
%.yy.o: %.l
$(LEX) -P $(shell perl -wlne 'print $$1 if /lex-func-prefix:\s([a-z]+)/' $<) \