[libpeas] Use correct directories under OS X

[Garrett Regier <gregier src gnome org>]

commit e1e50a58849cc35954f693c7be0505735079ed26
Author: Garrett Regier <alias301 gmail com>
Date:   Mon Jun 28 02:06:50 2010 -0700

    Use correct directories under OS X
    
    https://bugzilla.gnome.org/show_bug.cgi?id=622992

 libpeas/peas-dirs.c |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/libpeas/peas-dirs.c b/libpeas/peas-dirs.c
index 17a15ae..ef1644d 100644
--- a/libpeas/peas-dirs.c
+++ b/libpeas/peas-dirs.c
@@ -34,8 +34,13 @@ peas_dirs_get_data_dir (void)
 {
   gchar *data_dir;
 
-#ifndef G_OS_WIN32
-  data_dir = g_build_filename (DATADIR, "libpeas-1.0", NULL);
+#ifdef G_OS_WIN32
+  gchar *win32_dir;
+
+  win32_dir = g_win32_get_package_installation_directory_of_module (NULL);
+
+  data_dir = g_build_filename (win32_dir, "share", "libpeas-1.0", NULL);
+  g_free (win32_dir);
 #elif defined (OS_OSX)
   IgeMacBundle *bundle = ige_mac_bundle_get_default ();
 
@@ -50,12 +55,7 @@ peas_dirs_get_data_dir (void)
       data_dir = g_build_filename (DATADIR, "libpeas-1.0", NULL);
     }
 #else
-  gchar *win32_dir;
-
-  win32_dir = g_win32_get_package_installation_directory_of_module (NULL);
-
-  data_dir = g_build_filename (win32_dir, "share", "libpeas-1.0", NULL);
-  g_free (win32_dir);
+  data_dir = g_build_filename (DATADIR, "libpeas-1.0", NULL);
 #endif
 
   return data_dir;
@@ -66,8 +66,13 @@ peas_dirs_get_lib_dir (void)
 {
   gchar *lib_dir;
 
-#ifndef G_OS_WIN32
-  lib_dir = g_build_filename (LIBDIR, "libpeas-1.0", NULL);
+#ifdef G_OS_WIN32
+  gchar *win32_dir;
+
+  win32_dir = g_win32_get_package_installation_directory_of_module (NULL);
+
+  data_dir = g_build_filename (win32_dir, "lib", "libpeas-1.0", NULL);
+  g_free (win32_dir);
 #elif defined (OS_OSX)
   IgeMacBundle *bundle = ige_mac_bundle_get_default ();
 
@@ -82,12 +87,7 @@ peas_dirs_get_lib_dir (void)
       lib_dir = g_build_filename (LIBDIR, "libpeas-1.0", NULL);
     }
 #else
-  gchar *win32_dir;
-
-  win32_dir = g_win32_get_package_installation_directory_of_module (NULL);
-
-  data_dir = g_build_filename (win32_dir, "lib", "libpeas-1.0", NULL);
-  g_free (win32_dir);
+  lib_dir = g_build_filename (LIBDIR, "libpeas-1.0", NULL);
 #endif
 
   return lib_dir;