On Wed, May 13, 2009 at 18:05:03 +1000, Trent W.Buck wrote: > > I only noticed today, but this breaks autoconf builds, and parts of > > cabal (cabal dist?). References to tools/ in the build code need to > > be adjusted accordingly. > > Turns out both were also broken by the removal of the obsolete zsh > completion scripts. Whoops! This fixes that, and the tools->contrib > rename. > > Wed May 13 17:33:53 EST 2009 Trent W. Buck <[email protected]> > * Fix cabal sdist. > > Wed May 13 17:59:31 EST 2009 Trent W. Buck <[email protected]> > * Fix make install.
Churn :-). Applied, thanks! Fix cabal sdist. ---------------- > Trent W. Buck <[email protected]>**20090513073353 > Ignore-this: 65082b9b9122b7e733e40b9d975adbc6 > ] hunk ./darcs.cabal 47 > -- TODO: factor out these standalone executables to other sections > src/preproc.hs, src/unit.lhs, > > - -- The tools directory would make a sensible 'darcs-tools' package > - tools/zsh_completion_new, tools/zsh_completion_old, tools/darcs_completion, > - tools/cygwin-wrapper.bash, tools/update_roundup.pl, tools/upload.cgi, > - tools/cgi/darcs.cgi.in, tools/cgi/cgi.conf.in, tools/cgi/README.in > - tools/cgi/xslt/*.xslt, tools/cgi/xslt/*.xml, tools/cgi/xslt/*.css, > + -- The contrib directory would make a sensible 'darcs-contrib' package > + contrib/_darcs.zsh, contrib/darcs_completion, > + contrib/cygwin-wrapper.bash, contrib/update_roundup.pl, contrib/upload.cgi, > + contrib/cgi/darcs.cgi.in, contrib/cgi/cgi.conf.in, contrib/cgi/README.in > + contrib/cgi/xslt/*.xslt, contrib/cgi/xslt/*.xml, contrib/cgi/xslt/*.css, > > -- documentation files > src/best_practices.tex, src/building_darcs.tex, src/configuring_darcs.tex, > hunk ./darcs.cabal 56 > src/features.tex, src/gpl.tex, src/switching.tex, > - tools/cgi/README.in > + contrib/cgi/README.in > > README > > hunk ./darcs.cabal 71 > tests/lib > tests/example_binary.png > bugs/*.sh > - bugs/bin/darcs > > source-repository head > type: darcs Fix make install. ----------------- > Trent W. Buck <[email protected]>**20090513075931 > Ignore-this: ef74452ad2b09cb848edf77ce53d348 > ] hunk ./GNUmakefile 96 > $(INSTALL) darcs $< > install:: $(DESTDIR)$(sysconfdir)/bash_completion.d > > - $(INSTALL_DATA) tools/darcs_completion $</darcs > + $(INSTALL_DATA) contrib/darcs_completion $</darcs > install:: $(DESTDIR)$(mandir)/man1 doc/darcs.1 > $(INSTALL_DATA) doc/darcs.1 $(DESTDIR)$(mandir)/man1/ > install-ps: $(DESTDIR)$(docdir)/manual ps > hunk ./GNUmakefile 107 > $(INSTALL_DATA) doc/manual/*.png $< > $(INSTALL_DATA) doc/manual/*.html $< > install-examples: $(DESTDIR)$(docdir)/examples > - $(INSTALL_DATA) tools/zsh_completion_new $< > - $(INSTALL_DATA) tools/zsh_completion_old $< > + $(INSTALL_DATA) contrib/_darcs.zsh $< > .PHONY: install-ps install-pdf install-html install-examples > > hunk ./GNUmakefile 110 > -installserver: tools/cgi/darcs.cgi > +installserver: contrib/cgi/darcs.cgi > test -d $(DESTDIR)$(libexecdir)/cgi-bin || \ > $(INSTALL) -d $(DESTDIR)$(libexecdir)/cgi-bin > > hunk ./GNUmakefile 117 > test -d $(DESTDIR)$(sysconfdir)/darcs || \ > $(INSTALL) -d $(DESTDIR)$(sysconfdir)/darcs > test -f $(DESTDIR)$(sysconfdir)/darcs/cgi.conf || \ > - $(INSTALL_DATA) tools/cgi/cgi.conf > $(DESTDIR)$(sysconfdir)/darcs/cgi.conf > - $(INSTALL) tools/cgi/darcs.cgi $(DESTDIR)$(libexecdir)/cgi-bin/darcs.cgi > + $(INSTALL_DATA) contrib/cgi/cgi.conf > $(DESTDIR)$(sysconfdir)/darcs/cgi.conf > + $(INSTALL) contrib/cgi/darcs.cgi > $(DESTDIR)$(libexecdir)/cgi-bin/darcs.cgi > test -d $(DESTDIR)$(datadir)/darcs || \ > $(INSTALL) -d $(DESTDIR)$(datadir)/darcs > test -d $(DESTDIR)$(datadir)/darcs/xslt || \ > hunk ./GNUmakefile 123 > $(INSTALL) -d $(DESTDIR)$(datadir)/darcs/xslt > - $(INSTALL_DATA) tools/cgi/xslt/*.xslt $(DESTDIR)$(datadir)/darcs/xslt/ > - $(INSTALL_DATA) tools/cgi/xslt/errors.xml > $(DESTDIR)$(datadir)/darcs/xslt/ > - $(INSTALL_DATA) tools/cgi/xslt/styles.css > $(DESTDIR)$(datadir)/darcs/xslt/styles.css > + $(INSTALL_DATA) contrib/cgi/xslt/*.xslt $(DESTDIR)$(datadir)/darcs/xslt/ > + $(INSTALL_DATA) contrib/cgi/xslt/errors.xml > $(DESTDIR)$(datadir)/darcs/xslt/ > + $(INSTALL_DATA) contrib/cgi/xslt/styles.css > $(DESTDIR)$(datadir)/darcs/xslt/styles.css > > # Debian policy doesn't allow symlinks as configuration files. > # test -e $(DESTDIR)$(sysconfdir)/darcs/styles.css || \ > hunk ./GNUmakefile 131 > # ln -s $(datadir)/darcs/xslt/styles.css \ > # $(DESTDIR)$(sysconfdir)/darcs/styles.css > - $(INSTALL) -m 644 tools/cgi/xslt/styles.css > $(DESTDIR)$(sysconfdir)/darcs/styles.css > + $(INSTALL) -m 644 contrib/cgi/xslt/styles.css > $(DESTDIR)$(sysconfdir)/darcs/styles.css > > PREDIST_COPY_FILES = \ > AUTHORS \ > hunk ./GNUmakefile 386 > distclean:: clean > rm -rf config.status config.log autoconf.mk config.cache autom4te.cache > rm -f doc/manual/darcs.ps doc/manual/darcs.pdf > doc/manual/patch-theory.pdf darcs.idv > - rm -f tools/cgi/README tools/cgi/darcs.cgi tools/cgi/cgi.conf > + rm -f contrib/cgi/README contrib/cgi/darcs.cgi contrib/cgi/cgi.conf > rm -f config.command > rm -rf snapshots > > hunk ./GNUmakefile 402 > configure: configure.ac aclocal.m4 > autoconf > > -autoconf.mk tools/cgi/darcs.cgi : % : %.in config.status > +autoconf.mk contrib/cgi/darcs.cgi : % : %.in config.status > ./config.status > > config.status: configure > hunk ./configure.ac 641 > AC_DEFUN([AC_DATAROOTDIR_CHECKED]) > > AC_CONFIG_FILES([autoconf.mk > - tools/cgi/darcs.cgi tools/cgi/README tools/cgi/cgi.conf > + contrib/cgi/darcs.cgi contrib/cgi/README contrib/cgi/cgi.conf > release/darcs.spec]) > AC_OUTPUT > > -- Eric Kow <http://www.nltg.brighton.ac.uk/home/Eric.Kow> PGP Key ID: 08AC04F9
pgpwurWW4S6EL.pgp
Description: PGP signature
_______________________________________________ darcs-users mailing list [email protected] http://lists.osuosl.org/mailman/listinfo/darcs-users
