--- a/install	Sun Mar 08 15:12:20 2009 +0000
+++ b/install	Sun Mar 08 15:12:43 2009 +0000
@@ -28,7 +28,6 @@
     print >>sys.stderr, "Install must be run as root user"
     sys.exit(-1)
 
-dest = options.prefix + "/lib/mercurial-server"
 
 def installFiles(d, *sources):
     d = options.root + d
@@ -36,10 +35,13 @@
     for f in sources:
         shutil.copy(f, d)
 
-installFiles(dest,
+installFiles(options.prefix + '/lib/mercurial-server',
     'src/hg-ssh',
     'src/refresh-auth')
-installFiles(dest + '/mercurialserver',
+installFiles(options.prefix + '/lib/mercurial-server',
+    'src/hg-ssh',
+    'src/refresh-auth')
+installFiles(options.prefix + '/lib/mercurial-server/mercurialserver',
     'src/mercurialserver/__init__.py',
     'src/mercurialserver/paths.py',
     'src/mercurialserver/changes.py',
@@ -47,7 +49,7 @@
     'src/mercurialserver/servelog.py',
     'src/mercurialserver/refreshauth.py',
     'src/mercurialserver/ruleset.py')
-installFiles(dest + '/init',
+installFiles(options.prefix + '/lib/mercurial-server/init',
     'src/init/hginit',
     'src/init/hgadmin-hgrc')
 installFiles('/etc/mercurial-server',