diff options
| author | Lluis Sanchez <lluis@novell.com> | 2009-02-10 01:24:44 +0300 |
|---|---|---|
| committer | Lluis Sanchez <lluis@novell.com> | 2009-02-10 01:24:44 +0300 |
| commit | 7955e59eb4b45f3566cd263b00bd3d76cc5d6f1b (patch) | |
| tree | 4ed7f0aa7968fc4d97fdf1e591004fc86aafe702 | |
| parent | df53c3d10ec9012b7285b76eae2ea79ddabb2226 (diff) | |
2009-02-06 Michael Hutchinson <mhutchinson@novell.com>main-1.9.2
* Makefile.am: Fix distcheck. Updating the mime DB is leaving even
more junk.
* build/Makefile.am: Excludes the unfinished Mac packaging from
the build, as it was breaking make dist.
svn path=/branches/monodevelop/main/1.9.2/; revision=126383
| -rw-r--r-- | main/ChangeLog | 7 | ||||
| -rw-r--r-- | main/Makefile.am | 3 | ||||
| -rw-r--r-- | main/build/Makefile.am | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/main/ChangeLog b/main/ChangeLog index 0efe1d575d..74767a4880 100644 --- a/main/ChangeLog +++ b/main/ChangeLog @@ -1,3 +1,10 @@ +2009-02-06 Michael Hutchinson <mhutchinson@novell.com> + + * Makefile.am: Fix distcheck. Updating the mime DB is leaving even + more junk. + * build/Makefile.am: Excludes the unfinished Mac packaging from + the build, as it was breaking make dist. + 2009-02-03 Lluis Sanchez Gual <lluis@novell.com> * configure.in: Bump MD version. diff --git a/main/Makefile.am b/main/Makefile.am index 74785edcbb..420f8a465a 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -119,8 +119,9 @@ include $(top_srcdir)/Makefile.include # # From BEAST (LGPL license): http://svn.gnome.org/viewvc/beast/trunk/Makefile.am filter_stale_uninstalled = \ - | egrep -v '^.*/share/mime/(subclasses|globs|magic|XMLnamespaces|aliases|mime\.cache)$$' \ + | egrep -v '^.*/share/mime/.*$$' \ | egrep -v '^.*./share/icons/hicolor/icon-theme\.cache$$' + filter_stale_buildfiles = | egrep -v '^./report.out$$' distuninstallcheck_listfiles = find . -type f -print # automake-1.9 setting distuninstallcheck_listfiles += $(filter_stale_uninstalled) # amend by required filtering diff --git a/main/build/Makefile.am b/main/build/Makefile.am index bd2cbeb0e1..ca4cc2c7c8 100644 --- a/main/build/Makefile.am +++ b/main/build/Makefile.am @@ -1,11 +1,3 @@ - -if ENABLE_MACBUNDLE -SUBDIRS = MacOSX -else - -SUBDIRS= -endif - all: clean-local: |