get rid of the macosx hack by disting debian from toplevel Makefile.am

svn path=/trunk/ogg/; revision=9990
parent 6da95bab
......@@ -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`
......
......@@ -112,10 +112,5 @@ autoheader || exit 1
echo " autoconf"
autoconf || exit 1
# this search and replace hack is specifically for MacOSX where automake
# picks up changelog in debian/ because of filesystem
# case-not-quite-sensitivity breaking make distcheck
perl -i -p -e 's/DIST_COMMON = ChangeLog/DIST_COMMON =/g' debian/Makefile.in
cd $olddir
$srcdir/configure --enable-maintainer-mode "$@" && echo
......@@ -297,7 +297,6 @@ src/Makefile
doc/Makefile doc/libogg/Makefile
include/Makefile include/ogg/Makefile include/ogg/config_types.h
win32/Makefile
debian/Makefile
libogg.spec
ogg.pc
ogg-uninstalled.pc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment