summaryrefslogtreecommitdiff
path: root/acconfig.h
diff options
context:
space:
mode:
authorDarin Adler <darin@src.gnome.org>2000-06-09 02:05:35 +0000
committerDarin Adler <darin@src.gnome.org>2000-06-09 02:05:35 +0000
commitf9d22365cf9da11621306b89e420bfe6a0d5651f (patch)
tree1c038e5d6fd5d61f3f8ca67e0456b32fd4f037cc /acconfig.h
parent2b5c47669ab40739403125969410a46b60076458 (diff)
downloadnautilus-f9d22365cf9da11621306b89e420bfe6a0d5651f.tar.gz
Added NAUTILUS_PREFIX so we can locate our installed files correctly
* acconfig.h: * configure.in: Added NAUTILUS_PREFIX so we can locate our installed files correctly instead of assuming they are in the gnome-libs prefix. * components/help/hyperbola-filefmt.c: (fmt_map_entry): * components/websearch/ntl-web-search.c: (web_search_populate_engines): * libnautilus-extensions/nautilus-file-utilities.c: (nautilus_get_user_main_directory): * libnautilus-extensions/nautilus-link-set.c: (get_link_set_document): * src/file-manager/fm-properties-window.c: (get_property_names): * src/nautilus-property-browser.c: (nautilus_property_browser_drag_data_get), (make_drag_image), (get_xml_path), (make_properties_from_directory): Use NAUTILUS_PREFIX instead of gnome_datadir_file so we get the files from the right directory. Since gnome_datadir_file does a check to see if the file exists, had to add some explicit checks in various places. * components/html/glib-www-callbacks.c: Got rid of some warnings. * components/services/time/command-line/.cvsignore: * components/services/time/nautilus-view/.cvsignore: * components/services/time/service/.cvsignore: Ignore the new time stamp files. * libnautilus-extensions/nautilus-gdk-pixbuf-extensions.h: Fixed formatting. * RENAMING: * src/nautilus-sidebar-tabs.c: * src/nautilus-sidebar-tabs.h: * src/nautilus-sidebar-title.c: * src/nautilus-sidebar-title.h: * src/nautilus-sidebar.c: Renamed IndexTabs and IndexTitle to SidebarTabs and SidebarTitle as planned.
Diffstat (limited to 'acconfig.h')
-rw-r--r--acconfig.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/acconfig.h b/acconfig.h
index 42748b806..fba81f9c6 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -3,8 +3,7 @@
#undef HAVE_CATGETS
#undef HAVE_GETTEXT
#undef HAVE_LC_MESSAGES
-#undef HAVE_STPCPY
-
-#undef HAVE_RPM
#undef HAVE_PAM
-
+#undef HAVE_RPM
+#undef HAVE_STPCPY
+#undef NAUTILUS_PREFIX