From ea3e85e12caf9083bb6638ac6076de40af9828aa Mon Sep 17 00:00:00 2001 From: "Steven G. Johnson" Date: Wed, 28 Aug 2013 10:40:35 -0400 Subject: [PATCH] fix missing README, remove darcs cruft --- .gitignore | 1 + ChangeLog | 2 +- Makefile.am | 13 ++++++------- autogen.sh | 2 ++ 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 934111d..1b31c3d 100644 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ configure config.* autom4te.cache INSTALL +README aclocal.m4 depcomp missing diff --git a/ChangeLog b/ChangeLog index 887736d..5264766 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1 +1 @@ -Generated automatically by 'make darcs-dist' +See https://github.com/stevengj/nlopt for a detailed version history. diff --git a/Makefile.am b/Makefile.am index c400475..f1d9bd3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,10 +28,9 @@ endif pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = nlopt.pc -# Somewhat hackish. The "right" way to do this is by a dist-hook target, -# but then darcs check will fail because it doesn't run in the darcs -# repository. -darcs-dist: distdir - darcs changes --summary > $(distdir)/ChangeLog - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +if MAINTAINER_MODE + +README: README.md + cp -f README.md $@ + +endif diff --git a/autogen.sh b/autogen.sh index 01e0364..a9128df 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,6 +16,8 @@ done touch swig/nlopt.scm.in +cp README.md README + # paranoia: sometimes autoconf doesn't get things right the first time autoreconf --verbose --install --symlink --force autoreconf --verbose --install --symlink --force -- GitLab