Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* acinclude.m4: Add macro for defining SHARED_MIME_DIR.

Browse Source 
* configure.in: Use AM_SHARED_MIME macro.
* src/data/Makefile.am: Use defined GCONF_SCHEMA_FILE_DIR and
SHARED_MIME_DIR, not the hardcoded paths.


svn: r4199
This commit is contained in:
Alex Roitman 2005-03-17 17:19:34 +00:00
parent efb007259f
commit c7c5368409
4 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2005-03-17 Alex Roitman <shura@gramps-project.org>
* acinclude.m4: Add macro for defining SHARED_MIME_DIR.
* configure.in: Use AM_SHARED_MIME macro.
* src/data/Makefile.am: Use defined GCONF_SCHEMA_FILE_DIR and
SHARED_MIME_DIR, not the hardcoded paths.
2005-03-17 Martin Hawlisch <Martin.Hawlisch@gmx.de> 2005-03-17 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* src/Exporter.py (build_info_page): proofreading; (build_format_page): * src/Exporter.py (build_info_page): proofreading; (build_format_page):
shrink the size of the window by using tooltips to display the shrink the size of the window by using tooltips to display the

16
acinclude.m4 Normal file
View File

@ -0,0 +1,16 @@
dnl AM_SHARED_MIME
dnl Defines SHARED_MIME_DIR which is where mime type definitions should go.
dnl
AC_DEFUN([AM_SHARED_MIME],
[
if test "x$SHARED_MIME_DIR" = "x"; then
SHARED_MIME_DIR='$(prefix)/share/mime'
fi
AC_ARG_WITH(mime-dir,
[ --with-mime-dir=dir Shared mime directory.],SHARED_MIME_DIR="$withval",)
AC_SUBST(SHARED_MIME_DIR)
AC_MSG_RESULT([Using directory $SHARED_MIME_DIR for installation of mime type definitions])
])

1
configure.in
View File

@ -17,6 +17,7 @@ then
fi fi
AM_GCONF_SOURCE_2 AM_GCONF_SOURCE_2
AM_SHARED_MIME
AC_SUBST(RELEASE) AC_SUBST(RELEASE)
AC_SUBST(VERSIONSTRING) AC_SUBST(VERSIONSTRING)

16
src/data/Makefile.am
View File

@ -22,8 +22,8 @@ EXTRA_DIST = \
gramps.schemas gramps.schemas
install-schemas: install-schemas:
$(INSTALL) -d $(DESTDIR)$(sysconfdir)/gconf/schemas $(INSTALL) -d $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
$(INSTALL_DATA) $(top_srcdir)/src/data/gramps.schemas $(DESTDIR)$(sysconfdir)/gconf/schemas $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.schemas $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)
-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
gconftool-2 --makefile-install-rule $(top_srcdir)/src/data/gramps.schemas gconftool-2 --makefile-install-rule $(top_srcdir)/src/data/gramps.schemas
-pkill gconfd -pkill gconfd
@ -35,12 +35,12 @@ install-data-local: install-schemas
$(INSTALL_DATA) $(top_srcdir)/src/data/gnome-mime-application-x-*.png $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/ $(INSTALL_DATA) $(top_srcdir)/src/data/gnome-mime-application-x-*.png $(DESTDIR)$(prefix)/share/icons/gnome/48x48/mimetypes/
$(INSTALL) -d $(DESTDIR)$(prefix)/share/application-registry $(INSTALL) -d $(DESTDIR)$(prefix)/share/application-registry
$(INSTALL_DATA) $(top_srcdir)/src/data/gramps.applications $(DESTDIR)$(prefix)/share/application-registry $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.applications $(DESTDIR)$(prefix)/share/application-registry
$(INSTALL) -d $(DESTDIR)$(prefix)/share/mime/packages $(INSTALL) -d $(DESTDIR)$(SHARED_MIME_DIR)/packages
$(INSTALL_DATA) $(top_srcdir)/src/data/gramps.xml $(DESTDIR)$(prefix)/share/mime/packages $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.xml $(DESTDIR)$(SHARED_MIME_DIR)/packages
$(INSTALL) -d $(DESTDIR)$(prefix)/share/mime-info $(INSTALL) -d $(DESTDIR)$(prefix)/share/mime-info
$(INSTALL_DATA) $(top_srcdir)/src/data/gramps.keys $(DESTDIR)$(prefix)/share/mime-info $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.keys $(DESTDIR)$(prefix)/share/mime-info
$(INSTALL_DATA) $(top_srcdir)/src/data/gramps.mime $(DESTDIR)$(prefix)/share/mime-info $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.mime $(DESTDIR)$(prefix)/share/mime-info
update-mime-database $(DESTDIR)$(prefix)/share/mime update-mime-database $(DESTDIR)$(SHARED_MIME_DIR)
uninstall-local: uninstall-local:
-rm $(DESTDIR)$(prefix)/share/applications/gramps.desktop -rm $(DESTDIR)$(prefix)/share/applications/gramps.desktop
@ -48,8 +48,8 @@ uninstall-local:
-rm $(DESTDIR)$(prefix)/share/mime-info/gramps.keys -rm $(DESTDIR)$(prefix)/share/mime-info/gramps.keys
-rm $(DESTDIR)$(prefix)/share/mime-info/gramps.mime -rm $(DESTDIR)$(prefix)/share/mime-info/gramps.mime
-rm $(DESTDIR)$(prefix)/share/application-registry/gramps.applications -rm $(DESTDIR)$(prefix)/share/application-registry/gramps.applications
-rm $(DESTDIR)$(prefix)/share/mime/packages/gramps.xml -rm $(DESTDIR)$(SHARED_MIME_DIR)/packages/gramps.xml
-rm $(DESTDIR)$(sysconfdir)/gconf/schemas/gramps.schemas -rm $(DESTDIR)$(GCONF_SCHEMA_FILE_DIR)/gramps.schemas
update-mime-database $(DESTDIR)$(prefix)/share/mime update-mime-database $(DESTDIR)$(SHARED_MIME_DIR)
-GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ -GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
gconftool-2 --makefile-uninstall-rule $(top_srcdir)/src/data/gramps.schemas gconftool-2 --makefile-uninstall-rule $(top_srcdir)/src/data/gramps.schemas