tagging ychat-0.7.7.1ychat-0.7.7.1

1 files changed, 11 insertions, 31 deletions

diff --git a/Makefile b/Makefile
index 96266ea..e0b6e07 100755
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-MAKE=`tail -1 make.version`
+MAKE=`tail -n 1 make.version`
 PREFIX=`grep "define PREFIX" src/glob.h | cut -d'"' -f2`
-all:    base modules version mail
+all:    version base modules version 
 	@echo "Now edit the ychat.conf and run ychat!"
 	@echo "The config file is searched in the following order:"
 	@echo " ./ychat.conf " 
@@ -8,9 +8,12 @@ all:    base modules version mail
 	@echo " ./etc/ychat.conf "
 	@echo " /etc/ychat.conf "
 	@echo " $(PREFIX)/etc/ychat.conf "
+	@echo If you want to help the yChat project please run gmake mail
+	@echo so that the developers receive an email about the platform
+	@echo being used.
 mail:
 	@echo "VERSION:" > mail.tmp
-	@gmake version >> mail.tmp
+	@${MAKE} version >> mail.tmp
 	@echo >> mail.tmp
 	@echo "UNAME:" >> mail.tmp
 	@uname -a >> mail.tmp
@@ -22,35 +25,12 @@ mail:
 	@cat g++.version make.version >> mail.tmp
 	@cat mail.tmp | mail -s "Successfull build of yChat" successfullbuild@yhttpd.org
 	@rm -f mail.tmp 
-install:	deinstall
-	@echo "Instaling ychat to $(PREFIX)"
-	@cp bin/ychat $(PREFIX)/bin 
-	@if ! test -d $(PREFIX)/lib/ychat; then mkdir -p $(PREFIX)/lib/ychat; fi
-	@if ! test -d $(PREFIX)/share/ychat/log/rooms; then mkdir -p $(PREFIX)/share/ychat/log/rooms; fi
-	@if ! test -d $(PREFIX)/etc; then mkdir $(PREFIX)/etc; fi
-	@if test -d mods; then cp -Rp mods $(PREFIX)/lib/ychat/mods; fi
-	@cp -Rp html $(PREFIX)/share/ychat/html
-	@cp -Rp lang $(PREFIX)/share/ychat/lang
-	@if test -f $(PREFIX)/etc/ychat.conf; then mv $(PREFIX)/etc/ychat.conf $(PREFIX)/etc/ychat.conf.bak; fi
-	@cp etc/ychat.conf etc/ychat.conf.tmp
-	@sed "s#mods/#$(PREFIX)/lib/ychat/mods/#" etc/ychat.conf.tmp > etc/ychat.conf.tmp.2 && mv etc/ychat.conf.tmp.2 etc/ychat.conf.tmp 
-	@sed "s#\"log/#\"$(PREFIX)/share/ychat/log/#" etc/ychat.conf.tmp > etc/ychat.conf.tmp.2 && mv etc/ychat.conf.tmp.2 etc/ychat.conf.tmp 
-	@sed "s#LANGUAGE_DIR=\"lang/#LANGUAGE_DIR=\"$(PREFIX)/share/ychat/lang/#" etc/ychat.conf.tmp > etc/ychat.conf.tmp.2 && mv etc/ychat.conf.tmp.2 etc/ychat.conf.tmp 
-	@sed "s#HTML_TEMPLATE_DIR=\"html/#HTML_TEMPLATE_DIR=\"$(PREFIX)/share/ychat/html/#" etc/ychat.conf.tmp > etc/ychat.conf.tmp.2 && mv etc/ychat.conf.tmp.2 etc/ychat.conf.tmp 
-	@mv etc/ychat.conf.tmp $(PREFIX)/etc/ychat.conf
-	@echo "yChat configuration file can be found under"
-	@echo " $(PREFIX)/etc/ychat.conf"
-	@echo "Copy it to ~/.ychat/ychat.conf to use local settings :-)"
-	@echo "Be sure that $(PREFIX)/share/ychat/logs is writable by your user or modify "
-	@echo "logging dirs in the ychat.conf to a local directory."
-	@echo "The most secure would be an additional user 'ychat'!"
+install: deinstall
 uninstall: deinstall
 deinstall:
-	@echo "Deinstalling ychat from $(PREFIX)"
-	@if test -f $(PREFIX)/bin/ychat; then rm -f $(PREFIX)/bin/ychat; fi
-	@if test -d $(PREFIX)/lib/ychat; then rm -Rf $(PREFIX)/lib/ychat; fi
-	@if test -d $(PREFIX)/share/ychat; then rm -Rf $(PREFIX)/share/ychat; fi
-	@echo "Done. Please remove manually $(PREFIX)/etc/ychat.conf to complete"
+	@echo Install/deinstall is not supported!
+	@echo Start yChat with ./bin/ychat instead! 
+	@exit 1
 modules:
 	@if test -d ./src/mods; then ${MAKE} -C ./src/mods; fi 
 clean_modules:
@@ -99,6 +79,6 @@ mrproper: clean
 	@find . -name "*.add" | xargs rm -f
 	@ls | grep core | xargs rm -f
 version:
-	@echo "`grep VERSION src/msgs.h | cut -d'"' -f2`-`grep BRANCH src/msgs.h| cut -d'"' -f2` Build `grep BUILD src/msgs.h| cut -d' ' -f3`" 
+	@./scripts/version.sh
 debug:
 	@gdb bin/ychat ychat.core