Mercurial > hg > webserver / file diff

--- a/Makefile	Sun Dec 30 15:49:44 2012 +0100
+++ b/Makefile	Mon Dec 31 00:07:52 2012 +0100
@@ -26,44 +26,19 @@
 # POSSIBILITY OF SUCH DAMAGE.
 #
 
-include conf.mk
-
-all:
+all: config.mk
 	@echo "build server"
 	cd src; $(MAKE) all
 
+config.mk:
+	@echo "create config"
+	./configure
+
 clean:
 	@echo "clean"
 	rm -f -R build
 	rm -f -R work
 
-install: all
-	@echo "install Webserver to $(WS_INSTALL_DIR)"
-	mkdir -p $(WS_INSTALL_DIR)bin
-	mkdir -p $(WS_INSTALL_DIR)lib
-	mkdir -p $(WS_INSTALL_DIR)config
-	mkdir -p $(WS_INSTALL_DIR)docs
-	mkdir -p $(WS_INSTALL_DIR)logs
-	mkdir -p $(WS_INSTALL_DIR)include
-	@echo "copy config"
-	cp templates/config/init.conf $(WS_INSTALL_DIR)config/init.conf
-	cp templates/config/obj.conf $(WS_INSTALL_DIR)config/obj.conf
-	cp templates/config/server.conf $(WS_INSTALL_DIR)config/server.conf
-	cp templates/config/mime.types $(WS_INSTALL_DIR)config/mime.types
-	@echo "copy binaries"
-	mv work/bin/webservd work/bin/webservd.bin
-	cp work/bin/webservd.bin $(WS_INSTALL_DIR)bin/webservd
-	rm work/bin/webservd.bin
-	@echo "copy includes"
-	cp src/server/public/nsapi.h $(WS_INSTALL_DIR)include/nsapi.h
-	@echo "copy scripts"
-	sed s:%%WS_INSTALL_DIR%%:$(WS_INSTALL_DIR):g templates/bin/startserv.template > $(WS_INSTALL_DIR)bin/startserv
-	chmod +x $(WS_INSTALL_DIR)bin/startserv
-	sed s:%%WS_INSTALL_DIR%%:$(WS_INSTALL_DIR):g templates/bin/stopserv.template > $(WS_INSTALL_DIR)bin/stopserv
-	chmod -x $(WS_INSTALL_DIR)bin/stopserv
-	sed s:%%WS_INSTALL_DIR%%:$(WS_INSTALL_DIR):g templates/bin/reconfig.template > $(WS_INSTALL_DIR)bin/reconfig
-	chmod -x $(WS_INSTALL_DIR)bin/reconfig
-	@echo "copy docs"
-	cp -R templates/docs $(WS_INSTALL_DIR)
-	
+install:
+	cd make; $(MAKE) -f install.mk install