* doc/Makefile.am: Remove unneeded CLEANFILES, they're defined below.

* doc/xmldocs.make: Add Makefile to CLEANFILES; Explictly clean
stuff in distclean-hook.
* src/Makefile.am: Remove gramps.desktop from GRAPHICS.
* src/data/Makefile.am: Remove EXTRA_DIST; split files that do not
need to be in $PREFIX/share/gramps into dist_data_DATA: they're
installed explicitly to the proper locations anyway, and this is
only needed for distribution.


svn: r3782
This commit is contained in:
Alex Roitman 2004-12-06 04:24:12 +00:00
parent 7e70532009
commit 65cb8dc6ed
5 changed files with 19 additions and 8 deletions

View File

@ -1,3 +1,13 @@
2004-12-05 Alex Roitman <shura@alex.neuro.umn.edu>
* doc/Makefile.am: Remove unneeded CLEANFILES, they're defined below.
* doc/xmldocs.make: Add Makefile to CLEANFILES; Explictly clean
stuff in distclean-hook.
* src/Makefile.am: Remove gramps.desktop from GRAPHICS.
* src/data/Makefile.am: Remove EXTRA_DIST; split files that do not
need to be in $PREFIX/share/gramps into dist_data_DATA: they're
installed explicitly to the proper locations anyway, and this is
only needed for distribution.
2004-12-05 Don Allingham <dallingham@users.sourceforge.net> 2004-12-05 Don Allingham <dallingham@users.sourceforge.net>
* src/DateParser.py: documenation enhancements * src/DateParser.py: documenation enhancements
* src/GrampsBSDDB.py: Add cursor class * src/GrampsBSDDB.py: Add cursor class

View File

@ -10,4 +10,4 @@ EXTRA_DIST = $(man_MANS) $(man_IN_FILES) xmldocs.make omf.make
gramps.1: $(top_builddir)/config.status gramps.1.in gramps.1: $(top_builddir)/config.status gramps.1.in
cd $(top_builddir) && CONFIG_FILES=doc/$@ $(SHELL) ./config.status cd $(top_builddir) && CONFIG_FILES=doc/$@ $(SHELL) ./config.status
CLEANFILES=$(man_MANS) $(SUBDIRS)/*/*.out $(SUBDIRS)/*/omf_timestamp CLEANFILES=$(man_MANS)

View File

@ -43,7 +43,7 @@ xml_files = $(entities) $(docname).xml
omf_dir=$(top_srcdir)/omf-install omf_dir=$(top_srcdir)/omf-install
EXTRA_DIST = $(xml_files) $(omffile) EXTRA_DIST = $(xml_files) $(omffile)
CLEANFILES = omf_timestamp CLEANFILES = omf_timestamp Makefile
include $(top_srcdir)/doc/omf.make include $(top_srcdir)/doc/omf.make
@ -61,6 +61,7 @@ distclean-hook:
then \ then \
rm -f $(entities); \ rm -f $(entities); \
fi fi
-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
app-dist-hook: app-dist-hook:
if test "$(figdir)"; then \ if test "$(figdir)"; then \

View File

@ -129,7 +129,6 @@ GRAPHICS = \
home.png\ home.png\
logo.png\ logo.png\
gramps.png \ gramps.png \
gramps.desktop \
media.png\ media.png\
people48.png\ people48.png\
place.png\ place.png\

View File

@ -5,21 +5,22 @@ pkgdatadir = $(datadir)/@PACKAGE@/data
dist_pkgdata_DATA = \ dist_pkgdata_DATA = \
gedcom.xml \ gedcom.xml \
papersize.xml \ papersize.xml \
tips.xml \ tips.xml
dist_data_DATA = \
gramps.desktop \
gnome-mime-application-x-gramps.png \ gnome-mime-application-x-gramps.png \
gnome-mime-application-x-gedcom.png \ gnome-mime-application-x-gedcom.png \
gnome-mime-application-x-gramps-package.png \ gnome-mime-application-x-gramps-package.png \
gnome-mime-application-x-gramps-xml.png \ gnome-mime-application-x-gramps-xml.png \
gnome-mime-application-x-geneweb.png \ gnome-mime-application-x-geneweb.png \
gramps.applications \
gramps.svg \ gramps.svg \
gramps.xml \
gramps.applications \
gramps.keys \ gramps.keys \
gramps.mime \ gramps.mime \
gramps.xml \
gramps.schemas gramps.schemas
EXTRA_DIST = $(dist_pkgdata_DATA)
install-schemas: install-schemas:
$(INSTALL) -d $(DESTDIR)$(sysconfdir)/gconf/schemas $(INSTALL) -d $(DESTDIR)$(sysconfdir)/gconf/schemas
$(INSTALL_DATA) $(top_srcdir)/src/data/gramps.schemas $(DESTDIR)$(sysconfdir)/gconf/schemas $(INSTALL_DATA) $(top_srcdir)/src/data/gramps.schemas $(DESTDIR)$(sysconfdir)/gconf/schemas