ouch/inspircd
2
0
Fork 0
mirror of https://github.com/inspircd/inspircd.git synced 2025-03-11 11:39:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1162 from SaberUK/insp20+fix-deinstall

Browse Source 
[2.0] Delete modules cautiously when doing a deinstall.
This commit is contained in:
Attila Molnar 2016-03-29 12:55:02 +02:00
commit a785f350fd
1 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
make/template/main.mk
View File

@ -220,22 +220,22 @@ install: target
echo ""; \ echo ""; \
exit 1; \ exit 1; \
fi fi
@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) "$(BASE)" @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(BASE)
@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) "$(DATPATH)" @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(DATPATH)
@-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) "$(LOGPATH)" @-$(INSTALL) -d -o $(INSTUID) -m $(INSTMODE_DIR) $(LOGPATH)
@-$(INSTALL) -d -m $(INSTMODE_DIR) "$(BINPATH)" @-$(INSTALL) -d -m $(INSTMODE_DIR) $(BINPATH)
@-$(INSTALL) -d -m $(INSTMODE_DIR) "$(CONPATH)/examples/aliases" @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/aliases
@-$(INSTALL) -d -m $(INSTMODE_DIR) "$(CONPATH)/examples/modules" @-$(INSTALL) -d -m $(INSTMODE_DIR) $(CONPATH)/examples/modules
@-$(INSTALL) -d -m $(INSTMODE_DIR) "$(MODPATH)" @-$(INSTALL) -d -m $(INSTMODE_DIR) $(MODPATH)"
[ "$(BUILDPATH)/bin/" -ef "$(BINPATH)" ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" "$(BINPATH)" [ "$(BUILDPATH)/bin/" -ef $(BINPATH) ] || $(INSTALL) -m $(INSTMODE_BIN) "$(BUILDPATH)/bin/inspircd" $(BINPATH)
@IFNDEF PURE_STATIC @IFNDEF PURE_STATIC
[ "$(BUILDPATH)/modules/" -ef "$(MODPATH)" ] || $(INSTALL) -m $(INSTMODE_LIB) "$(BUILDPATH)/modules/"*.so "$(MODPATH)" [ "$(BUILDPATH)/modules/" -ef $(MODPATH) ] || $(INSTALL) -m $(INSTMODE_LIB) "$(BUILDPATH)/modules/"*.so $(MODPATH)
@ENDIF @ENDIF
-$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ "$(BASE)" 2>/dev/null -$(INSTALL) -m $(INSTMODE_BIN) @STARTSCRIPT@ $(BASE) 2>/dev/null
-$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs "$(BASE)/.gdbargs" 2>/dev/null -$(INSTALL) -m $(INSTMODE_LIB) tools/gdbargs $(BASE)/.gdbargs 2>/dev/null
-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example "$(CONPATH)/examples" -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/*.example $(CONPATH)/examples
-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example "$(CONPATH)/examples/aliases" -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/aliases/*.example $(CONPATH)/examples/aliases
-$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example "$(CONPATH)/examples/modules" -$(INSTALL) -m $(INSTMODE_LIB) docs/conf/modules/*.example $(CONPATH)/examples/modules
@echo "" @echo ""
@echo "*************************************" @echo "*************************************"
@echo "* INSTALL COMPLETE! *" @echo "* INSTALL COMPLETE! *"
@ -265,11 +265,12 @@ clean:
@echo Completed. @echo Completed.
deinstall: deinstall:
-rm -f "$(BINPATH)/inspircd" -rm -f $(BINPATH)/inspircd
-rm -rf "$(CONPATH)/examples" -rm -rf $(CONPATH)/examples
-rm -f "$(MODPATH)/*.so" -rm -f $(MODPATH)/cmd_*.so
-rm -f "$(BASE)/.gdbargs" -rm -f $(MODPATH)/m_*.so
-rm -f "$(BASE)/org.inspircd.plist" -rm -f $(BASE)/.gdbargs
-rm -f $(BASE)/org.inspircd.plist
squeakyclean: distclean squeakyclean: distclean