diff --git a/ChangeLog b/ChangeLog index 29d97f8f9..42db614d2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,16 @@ +2010-06-08 Nick Treleaven + + * Makefile.am: + Don't individually install data/*.tags as all data/* files will be + installed anyway. + + 2010-06-07 Frank Lanitz * tagmanager/tm_project.c: Fix a double free. (patch by Daniel Marjamaki, thanks). + 2010-06-06 Enrico Tröger * tagmanager/tm_workspace.c: diff --git a/Makefile.am b/Makefile.am index 21cb7f4c2..0bf780567 100644 --- a/Makefile.am +++ b/Makefile.am @@ -56,11 +56,6 @@ uninstall-local: install-data-local: @$(NORMAL_INSTALL) $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \ - $(INSTALL_DATA) $(srcdir)/data/c99.tags $(DESTDIR)$(pkgdatadir); \ - $(INSTALL_DATA) $(srcdir)/data/php.tags $(DESTDIR)$(pkgdatadir); \ - $(INSTALL_DATA) $(srcdir)/data/python.tags $(DESTDIR)$(pkgdatadir); \ - $(INSTALL_DATA) $(srcdir)/data/pascal.tags $(DESTDIR)$(pkgdatadir); \ - $(INSTALL_DATA) $(srcdir)/data/html_entities.tags $(DESTDIR)$(pkgdatadir); \ $(INSTALL_DATA) $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/GPL-2; \ for file in $(srcdir)/data/*; do \ if test -f $$file; then \