$NetBSD$

--- install.py.orig	2006-03-15 07:20:59.000000000 -0800
+++ install.py
@@ -88,30 +88,30 @@ def concatPath(lst):
     return s
 
 # frontends
-binDir      = concatPath([prefix, '/bin'])
+binDir      = concatPath([prefix, '/lib/csound5'])
 # Csound API header files
-includeDir  = concatPath([prefix, '/include/csound'])
+includeDir  = concatPath([prefix, '/include/csound5'])
 # Csound API libraries
-libDir      = concatPath([prefix, '/lib'])
+libDir      = concatPath([prefix, '/lib/csound5'])
 # single precision plugin libraries
-pluginDir32 = concatPath([libDir, '/csound/plugins'])
+pluginDir32 = concatPath([libDir, '/plugins'])
 # double precision plugin libraries
-pluginDir64 = concatPath([libDir, '/csound/plugins64'])
+pluginDir64 = concatPath([libDir, '/plugins64'])
 # XMG files
-xmgDir      = concatPath([prefix, '/share/csound/xmg'])
+xmgDir      = concatPath([prefix, '/share/csound5/xmg'])
 # documentation
-docDir      = concatPath([prefix, '/share/doc/csound'])
+docDir      = concatPath([prefix, '/share/doc/csound5'])
 # tclcsound.so
-tclDir      = concatPath([libDir, '/csound/tcl'])
+tclDir      = concatPath([libDir, '/tcl'])
 # csnd.jar
-javaDir     = concatPath([libDir, '/csound/java'])
+javaDir     = concatPath([libDir, '/java'])
 # LISP interface
-lispDir     = concatPath([libDir, '/csound/lisp'])
+lispDir     = concatPath([libDir, '/lisp'])
 # STK raw wave files
-rawWaveDir  = concatPath([prefix, '/share/csound/rawwaves'])
+rawWaveDir  = concatPath([prefix, '/share/csound5/rawwaves'])
 
 # csnd.py
-pythonDir   = '/usr/lib/python' + pyVersion + '/site-packages'
+pythonDir   = prefix + '/lib/python' + pyVersion + '/site-packages'
 # _csnd.so
 pythonDir2  = pythonDir
 
@@ -387,8 +387,6 @@ try:
     for i in fileList:
         print >> f, 'rm -f "%s"' % i
     print >> f, ''
-    print >> f, '/sbin/ldconfig > /dev/null 2> /dev/null'
-    print >> f, ''
     f.close()
     os.chmod(concatPath([instDir, binDir, 'uninstall-csound5']), 0755)
     addMD5(concatPath([instDir, binDir, 'uninstall-csound5']),
@@ -437,8 +435,5 @@ else:
         print '  RAWWAVE_PATH=%s' % rawWaveDir
     print 'Csound can be uninstalled by running %s/uninstall-csound5' % binDir
 
-if os.getuid() == 0:
-    runCmd(['/sbin/ldconfig'])
-
 print ''
 
