extras-buildsys/server Makefile,1.2,1.3 buildserver.py,1.10,1.11

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23435/server

Modified Files:
	Makefile buildserver.py 
Log Message:
More install & location fixup


Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile	27 Jun 2005 21:29:22 -0000	1.2
+++ Makefile	28 Jun 2005 01:41:33 -0000	1.3
@@ -1,10 +1,11 @@
 BINDIR=/usr/bin
 DATADIR=/usr/share
 ETCDIR=/etc
-DESTDIR=''
 INSTALL=/usr/bin/install
 MKDIR=/bin/mkdir
 
+PKGNAME = plague
+
 clean:
 	rm -f *.pyc *.pyo *~ *.bak
 


Index: buildserver.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/buildserver.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- buildserver.py	26 Jun 2005 14:52:30 -0000	1.10
+++ buildserver.py	28 Jun 2005 01:41:33 -0000	1.11
@@ -18,14 +18,18 @@
 
 import sys
 import os
-import BuildMaster
-from client_manager import BuildClientManager
 from plague import SimpleHTTPSServer
 from plague import SimpleSSLXMLRPCServer
-import User
-from UserInterface import UserInterfaceSSLAuth, UserInterfaceNoAuth
 import SimpleXMLRPCServer
 
+sys.path.append('/usr/share/plague/server')
+
+import User
+import BuildMaster
+from client_manager import BuildClientManager
+from UserInterface import UserInterfaceSSLAuth
+from UserInterface import UserInterfaceNoAuth
+
 
 # Load in the config
 execfile("/etc/plague/server/CONFIG.py")