diff options
| author | wl <wl> | 2010-06-02 14:02:10 +0000 |
|---|---|---|
| committer | wl <wl> | 2010-06-02 14:02:10 +0000 |
| commit | 3afbe79f1046e5e446155e652a84ef4534f946b5 (patch) | |
| tree | c5292615b5b503b84335aafb9c2d572a4223c00f | |
| parent | 41c100dae9b4c8169f78ac1f0d55e33119d6bb57 (diff) | |
| download | groff-3afbe79f1046e5e446155e652a84ef4534f946b5.tar.gz | |
* Makefile.sub (install): Fix handling of examples/122.
It tried to process the CVS subdirectory as a file.
| -rw-r--r-- | contrib/chem/ChangeLog | 7 | ||||
| -rw-r--r-- | contrib/chem/Makefile.sub | 12 |
2 files changed, 13 insertions, 6 deletions
diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog index aee1fffc..13e9b1c2 100644 --- a/contrib/chem/ChangeLog +++ b/contrib/chem/ChangeLog @@ -1,3 +1,8 @@ +2010-06-02 Larry Jones <lawrence.jones@siemens.com> + + * Makefile.sub (install): Fix handling of examples/122. + It tried to process the CVS subdirectory as a file. + 2009-01-03 Werner LEMBERG <wl@gnu.org> * chem.pl: Prepare for groff version 1.20. @@ -195,7 +200,7 @@ ________________________________________________________________ License - Copyright (C) 2006, 2007, 2008, 2009 + Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Written by Bernd Warken diff --git a/contrib/chem/Makefile.sub b/contrib/chem/Makefile.sub index 1da996ec..b6a19b71 100644 --- a/contrib/chem/Makefile.sub +++ b/contrib/chem/Makefile.sub @@ -2,10 +2,10 @@ # File position: <groff-source>/contrib/chem/Makefile.sub -# Copyright (C) 2006, 2009 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc. # Written by Bernd Warken. -# Last update: 5 Jan 2009 +# Last update: 2 Jun 2010 # This file is part of `chem' which is part of `groff'. @@ -51,9 +51,9 @@ chem: $(srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT) chmod +x $@ install_data: chem \ - README examples/README \ + README examples/README examples/122/README \ $(srcdir)/chem.pic \ - $(srcdir)/examples/*.chem $(srcdir)/examples/122/* + $(srcdir)/examples/*.chem $(srcdir)/examples/122/*.chem -test -d $(DESTDIR)$(bindir) || $(mkinstalldirs) $(DESTDIR)$(bindir) $(RM) $(DESTDIR)$(bindir)/$(g)chem $(INSTALL_SCRIPT) chem $(DESTDIR)$(bindir)/$(g)chem @@ -74,7 +74,9 @@ install_data: chem \ $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/$$n; \ done -$(RM) $(DESTDIR)$(exampledir)/chem/122/* - for i in $(srcdir)/examples/122/*; do \ + $(INSTALL_DATA) examples/122/README \ + $(DESTDIR)$(exampledir)/chem/122/README + for i in $(srcdir)/examples/122/*.chem; do \ n=`echo $$i | sed 's|$(srcdir)/examples/122/||g'`; \ $(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/122/$$n; \ done |