[GNUnet-SVN] r898 - GNUnet/contrib/win

[durner]

Author: durner
Date: 2005-06-12 03:44:50 -0700 (Sun, 12 Jun 2005)
New Revision: 898

Modified:
   GNUnet/contrib/win/Installer.nsi
Log:
fixes

Modified: GNUnet/contrib/win/Installer.nsi
===================================================================
--- GNUnet/contrib/win/Installer.nsi    2005-06-12 10:44:17 UTC (rev 897)
+++ GNUnet/contrib/win/Installer.nsi    2005-06-12 10:44:50 UTC (rev 898)
@@ -94,6 +94,7 @@
          SetOutPath "$INSTDIR\bin"
          File "gnu.ico"        
                File "C:\GNUnet\bin\libgnunetutil-1.dll" 
+               File "C:\GNUnet\bin\libgnunetgetoption_api-0.dll"
                File "C:\GNUnet\bin\gnunet-win-tool.exe"
                File "C:\GNUnet\bin\gnunet-update.exe" 
                SetOutPath "$INSTDIR\var\lib\GNUnet"
@@ -518,7 +519,7 @@
        Delete "$INSTDIR\bin\libextractor_deb.dll"
        Delete "$INSTDIR\bin\libextractor_dvi.dll"
        Delete "$INSTDIR\bin\libextractor_elf.dll"
-       Delete "$INSTDIR\bin\libextractor_Deletename.dll"
+       Delete "$INSTDIR\bin\libextractor_filename.dll"
        Delete "$INSTDIR\bin\libextractor_gif.dll"
        Delete "$INSTDIR\bin\libextractor_hash_md5.dll"
        Delete "$INSTDIR\bin\libextractor_hash_rmd160.dll"
@@ -564,6 +565,7 @@
        Delete "$INSTDIR\bin\libgnunetecrs-0.dll"
        Delete "$INSTDIR\bin\libgnunetfs-0.dll"
        Delete "$INSTDIR\bin\libgnunetfsui-0.dll"
+       Delete "$INSTDIR\bin\libgnunetgetoption_api-0.dll"
        Delete "$INSTDIR\bin\libgnunetmodule_advertising.dll"
        Delete "$INSTDIR\bin\libgnunetmodule_bootstrap.dll"
        Delete "$INSTDIR\bin\libgnunetmodule_chat.dll"                  
@@ -610,7 +612,7 @@
        Delete "$INSTDIR\bin\libpng12.dll"
        Delete "$INSTDIR\bin\libsqlite3-0.dll"
        Delete "$INSTDIR\bin\libvorbis-0.dll"
-       Delete "$INSTDIR\bin\libvorbisDelete-3.dll"
+       Delete "$INSTDIR\bin\libvorbisfile-3.dll"
        Delete "$INSTDIR\bin\libxml2.dll"
        Delete "$INSTDIR\bin\pthreadGC1.dll"
        Delete "$INSTDIR\bin\sqlite3.exe"
@@ -619,6 +621,10 @@
        
        Delete "$INSTDIR\etc\gnunet.root"
        Delete "$INSTDIR\etc\gnunet.user"
+       Delete "$INSTDIR\etc\gnunetd.conf"
+       Delete "$INSTDIR\etc\gnunet.conf"
+       Delete "$INSTDIR\etc\gnunetd.old"
+       Delete "$INSTDIR\etc\gnunet.old"
        Delete "$INSTDIR\etc\gtk-2.0\gdk-pixbuf.loaders"
        Delete "$INSTDIR\etc\pango\pango.aliases"
        Delete "$INSTDIR\etc\pango\pango.modules"
@@ -635,12 +641,14 @@
   RmDir /REBOOTOK "$INSTDIR\lib\gtk-2.0"
        Delete "$INSTDIR\lib\pango\1.4.0\modules\pango-basic-win32.dll"
   RmDir /REBOOTOK "$INSTDIR\lib\pango\1.4.0\modules"
+  RmDir /REBOOTOK "$INSTDIR\lib\pango\1.4.0"
+  RmDir /REBOOTOK "$INSTDIR\lib\pango"
   RmDir /REBOOTOK "$INSTDIR\lib"
   
-  Delete "$INSTDIR\share\gnunet_logo.png"
-  Delete "$INSTDIR\share\gnunet-gtk.glade"
-  Delete "$INSTDIR\share\info.png"
-  Delete "$INSTDIR\share\up.png"
+  Delete "$INSTDIR\share\gnunet-gtk\gnunet_logo.png"
+  Delete "$INSTDIR\share\gnunet-gtk\gnunet-gtk.glade"
+  Delete "$INSTDIR\share\gnunet-gtk\info.png"
+  Delete "$INSTDIR\share\gnunet-gtk\up.png"
   
        Delete "$INSTDIR\share\GNUnet\config-client.in" 
        Delete "$INSTDIR\share\GNUnet\config-daemon.in"