Commit a55d0dda authored by Matteo Quintiliani's avatar Matteo Quintiliani
Browse files

Merge branch 'release/2.1.5'

parents 0ff0456a 0bdd0464
......@@ -2,18 +2,14 @@
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = lib src
dist_doc_DATA = BUGS HISTORY README
dist_doc_DATA = BUGS HISTORY README earthworm/nmxptool_cmd.html earthworm/nmxptool_ovr.html
EWMAKEFILEUX=earthworm/makefile.ux.nognu
EXTRA_DIST = earthworm seiscomp_templates makefile.unix
dist-hook:
ln -f -s ${EWMAKEFILEUX} makefile.unix
rm -rf `find $(distdir)/earthworm -name CVS`
rm -rf `find $(distdir)/seiscomp_templates -name CVS`
rm -rf `find $(distdir)/earthworm -name .svn`
rm -rf `find $(distdir)/seiscomp_templates -name .svn`
rm -rf `find $(distdir)/doc -name CVS`
rm -rf `find $(distdir)/doc -name .svn`
binary_distdir_FILES= \
AUTHORS \
......@@ -24,12 +20,8 @@ binary_distdir_FILES= \
README \
README_DISTBIN \
bin/nmxptool${EXEEXT} \
earthworm/nmxptool.d \
earthworm/nmxptool.desc \
earthworm/nmxptool.list.txt \
earthworm/nmxptool_cmd.html \
earthworm/nmxptool_ovr.html \
seiscomp_templates
earthworm \
seiscomp_templates
if ENABLE_DLL_PTHREAD
binary_distdir_FILES+= bin/${DLL_PTHREAD}
......
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