Rename the 'mime-type' capplet to 'nautilus-mime-capplet' to avoid

clobbering the control-center's one.
This commit is contained in:
Ramiro Estrugo 2000-05-24 18:12:35 +00:00
parent 674dd004d8
commit 641d410d53
4 changed files with 16 additions and 10 deletions

View file

@ -2,4 +2,4 @@ Makefile
Makefile.in Makefile.in
.deps .deps
.libs .libs
mime-type-capplet nautilus-mime-type-capplet

View file

@ -5,25 +5,31 @@ INCLUDES = -I. -I$(srcdir) \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-I$(includedir) -I$(includedir)
bin_PROGRAMS = mime-type-capplet bin_PROGRAMS = nautilus-mime-type-capplet
mime_type_capplet_SOURCES = mime-type-capplet.c\ nautilus_mime_type_capplet_SOURCES =\
mime-data.h mime-data.c edit-window.c\ nautilus-mime-type-capplet.c\
edit-window.h mime-info.c mime-info.h \ mime-data.h \
new-mime-window.h new-mime-window.c 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_LIBDIR) \
$(CAPPLET_LIBS) $(CAPPLET_LIBS)
$(ORBIT_LIBS) \ $(ORBIT_LIBS) \
$(INTLLIBS) $(INTLLIBS)
EXTRA_DIST = \ EXTRA_DIST = \
mime-type.desktop nautilus-mime-type.desktop
sysdir = $(datadir)/control-center sysdir = $(datadir)/control-center
sys_DATA = mime-type.desktop sys_DATA = nautilus-mime-type.desktop
install-data-local: 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