[mw-devel] MW3 r1254 - in trunk: . debian-template src/webclient

[arthur at sucs.org]

Author: arthur
Date: 2011-06-27 09:57:43 +0100 (Mon, 27 Jun 2011)
New Revision: 1254

Modified:
   trunk/Makefile
   trunk/debian-template/postinst
   trunk/src/webclient/Makefile
Log:
Add mwpoll to the main deb package to prevent perms issues


Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2011-06-27 08:29:38 UTC (rev 1253)
+++ trunk/Makefile	2011-06-27 08:57:43 UTC (rev 1254)
@@ -4,6 +4,7 @@
 build:
 	$(MAKE) -C src $@
 	$(MAKE) -C po $@
+	$(MAKE) -C src/webclient $@
 
 ifeq ($(SVNVER),exported)
 # These rules can only be called from inside an exported tree
@@ -12,6 +13,7 @@
 	cp -a $(INSTALLFILES) $(DESTDIR)$(libdir)/mw/
 	$(MAKE) -C src $@
 	$(MAKE) -C po $@
+	$(MAKE) -C src/webclient $@
 
 deb:
 	cp -a debian-template debian
@@ -53,6 +55,7 @@
 clean:
 	$(MAKE) -C src $@
 	$(MAKE) -C po $@
+	$(MAKE) -C src/webclient $@
 
 version:
 	@echo $(VERSION)

Modified: trunk/debian-template/postinst
===================================================================
--- trunk/debian-template/postinst	2011-06-27 08:29:38 UTC (rev 1253)
+++ trunk/debian-template/postinst	2011-06-27 08:57:43 UTC (rev 1254)
@@ -22,10 +22,12 @@
 
 chown -R mw:mw /usr/lib/mw
 chown mw:mw /usr/bin/mw
+chown mw:mw /usr/lib/mw/mwpoll
 chown mw:mw /var/log/mw
 chown mw:mw /var/lib/mw
 chown mw:mw /var/run/mw
 chmod 6711 /usr/bin/mw
+chmod 6711 /usr/lib/mw/mwpoll
 chmod 640 /usr/lib/mw/login.banner
 chmod 644 /usr/lib/mw/colour/*
 chmod 755 /var/log/mw

Modified: trunk/src/webclient/Makefile
===================================================================
--- trunk/src/webclient/Makefile	2011-06-27 08:29:38 UTC (rev 1253)
+++ trunk/src/webclient/Makefile	2011-06-27 08:57:43 UTC (rev 1254)
@@ -1,5 +1,6 @@
-libdir := /usr/lib
-localstatedir := /var
+include ../../Makefile.common
+#libdir := /usr/lib
+#localstatedir := /var
 
 LOGDIR := $(localstatedir)/log/mw
 MSGDIR := $(localstatedir)/run/mw
@@ -54,6 +55,9 @@
 clean:
 	-rm -f *.o *.d mwpoll
 
+install: mwpoll
+	install -Ds mwpoll $(DESTDIR)$(HOMEPATH)/mwpoll
+
 ifndef TESTDIR
 test:
 	make TESTDIR=$(CURDIR)/mwtest $@