diff options
author | Thomas Vander Stichele <thomasvs@xiph.org> | 2005-09-07 19:04:01 +0000 |
---|---|---|
committer | Thomas Vander Stichele <thomasvs@xiph.org> | 2005-09-07 19:04:01 +0000 |
commit | ab8748e4d78c483236a5d9740fff255e7fb32ff2 (patch) | |
tree | cd6a9fe092203df688b40420e13d4c5b7182ac2d /Makefile.am | |
parent | d065e42cd430fef2ef81791fd321f9ecdd8cf68c (diff) | |
download | ogg-ab8748e4d78c483236a5d9740fff255e7fb32ff2.tar.gz |
get rid of the macosx hack by disting debian from toplevel Makefile.am
git-svn-id: http://svn.xiph.org/trunk/ogg@9990 0101bb08-14d6-0310-b084-bc0e0c8e3800
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 085a680..5297d70 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign 1.6 dist-zip -SUBDIRS = src include doc win32 debian +SUBDIRS = src include doc win32 m4datadir = $(datadir)/aclocal m4data_DATA = ogg.m4 @@ -10,12 +10,18 @@ m4data_DATA = ogg.m4 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = ogg.pc +# we include the whole debian/ dir in EXTRA_DIST because there's a problem +# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am +# to pick up on the lowercase changelog file and add ChangeLog to DIST_COMMON +# because of it, breaking make dist. This works just as well. EXTRA_DIST = README AUTHORS CHANGES COPYING \ libogg.spec libogg.spec.in \ ogg.m4 ogg.pc.in ogg-uninstalled.pc.in \ - macos macosx + macos macosx debian dist-hook: + rm -rf `find $(distdir)/debian -name .svn` + rm -rf `find $(distdir)/debian -name "Makefile*"` rm -rf `find $(distdir)/macos -name CVS` rm -rf `find $(distdir)/macosx -name CVS` |