Rename the 'mime-type' capplet to 'nautilus-mime-capplet' to avoid
clobbering the control-center's one.
This commit is contained in:
parent
674dd004d8
commit
641d410d53
4 changed files with 16 additions and 10 deletions
|
@ -2,4 +2,4 @@ Makefile
|
|||
Makefile.in
|
||||
.deps
|
||||
.libs
|
||||
mime-type-capplet
|
||||
nautilus-mime-type-capplet
|
||||
|
|
|
@ -5,25 +5,31 @@ INCLUDES = -I. -I$(srcdir) \
|
|||
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
|
||||
-I$(includedir)
|
||||
|
||||
bin_PROGRAMS = mime-type-capplet
|
||||
bin_PROGRAMS = nautilus-mime-type-capplet
|
||||
|
||||
mime_type_capplet_SOURCES = mime-type-capplet.c\
|
||||
mime-data.h mime-data.c edit-window.c\
|
||||
edit-window.h mime-info.c mime-info.h \
|
||||
new-mime-window.h new-mime-window.c
|
||||
nautilus_mime_type_capplet_SOURCES =\
|
||||
nautilus-mime-type-capplet.c\
|
||||
mime-data.h \
|
||||
mime-data.c \
|
||||
edit-window.c \
|
||||
edit-window.h \
|
||||
mime-info.c \
|
||||
mime-info.h \
|
||||
new-mime-window.h \
|
||||
new-mime-window.c
|
||||
|
||||
mime_type_capplet_LDADD =\
|
||||
nautilus_mime_type_capplet_LDADD =\
|
||||
$(CAPPLET_LIBDIR) \
|
||||
$(CAPPLET_LIBS)
|
||||
$(ORBIT_LIBS) \
|
||||
$(INTLLIBS)
|
||||
|
||||
EXTRA_DIST = \
|
||||
mime-type.desktop
|
||||
nautilus-mime-type.desktop
|
||||
|
||||
|
||||
sysdir = $(datadir)/control-center
|
||||
sys_DATA = mime-type.desktop
|
||||
sys_DATA = nautilus-mime-type.desktop
|
||||
|
||||
install-data-local:
|
||||
$(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/mime-type.desktop
|
||||
$(INSTALL_DATA) $(srcdir)/nautilus-mime-type.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/nautilus-mime-type.desktop
|
||||
|
|
Loading…
Add table
Reference in a new issue