diff options
| author | Darin Adler <darin@src.gnome.org> | 2001-03-15 23:17:57 +0000 |
|---|---|---|
| committer | Darin Adler <darin@src.gnome.org> | 2001-03-15 23:17:57 +0000 |
| commit | 1c5c03bc622d6549d12e88f9699bf81e7db387c2 (patch) | |
| tree | 32ea5d2362150ba790f100e29ccfe462d5b724a1 /data | |
| parent | 93b00cb5d101d941e89f97bf3f95dbf39db66786 (diff) | |
| download | nautilus-1c5c03bc622d6549d12e88f9699bf81e7db387c2.tar.gz | |
reviewed by: John Sullivan <sullivan@eazel.com>
Fix bug 7783 (Makefile.am used to install xml data is wrong):
* data/Makefile.am: Integrate build fix from fcrozat. Don't use
the magic "info" name since it is used for special purposes on
Mandrake and other systems.
Other strings:
* THANKS: Added some people who made recent contributions.
* check-THANKS.pl: Add some more alternate names.
* components/help/hyperbola-filefmt.c: (locale_score): Fix legal
code that doesn't compile with some versions of gcc by adding a
cast.
* help/nautilus-user-manual/es/.cvsignore: Add
nautilus-user-manual.junk.
* libnautilus-extensions/nautilus-directory-async.c:
(metafile_read_check_for_directory_callback),
(metafile_read_done_callback),
(metafile_write_failure_close_callback),
(metafile_write_success_close_callback),
(metafile_write_create_callback), (directory_load_callback),
(directory_count_callback), (new_files_callback), (has_problem),
(deep_count_callback), (mime_list_callback),
(top_left_read_callback), (get_info_callback),
(activation_uri_nautilus_link_read_callback),
(activation_uri_gmc_link_read_callback),
(cancel_activation_uri_for_file): Add ref/unref pairs that we need
in callbacks that use NautilusDirectory objects but that also send
out signals which might end up unref'ing them.
* libnautilus-extensions/nautilus-file-operations.c:
(nautilus_self_check_file_operations): Add tests to demonstrate
bug 7701.
* libnautilus-extensions/nautilus-smooth-text-layout-cache.c:
(nautilus_self_check_smooth_text_layout_cache): Fix some destroys
that should have been unrefs.
* libnautilus-extensions/nautilus-string.c:
(nautilus_self_check_string): Added tests for
nautilus_str_get_after_prefix.
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index ed2821ec6..5776913ef 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,15 +1,15 @@ NULL= -infodir = $(datadir)/nautilus +nautilusdatadir = $(datadir)/nautilus -info_DATA = \ +nautilusdata_DATA = \ browser.xml \ static_bookmarks.xml \ nautilus-extras.placeholder \ nautilus-suggested.placeholder \ $(NULL) -EXTRA_DIST = $(info_DATA) +EXTRA_DIST = $(nautilusdata_DATA) SUBDIRS = \ emblems \ |