[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 03/09: Makefile.sub (install_examples): Use `find', not shell gl
From: |
Werner LEMBERG |
Subject: |
[groff] 03/09: Makefile.sub (install_examples): Use `find', not shell globs. |
Date: |
Sun, 30 Mar 2014 20:13:34 +0000 |
wl pushed a commit to branch master
in repository groff.
commit 90aba0480242b13073c89b2ba6c4bd8c265a16ab
Author: Steffen Nurpmeso <address@hidden>
Date: Sun Mar 30 08:33:51 2014 +0200
Makefile.sub (install_examples): Use `find', not shell globs.
Instead of using rm(1) two times with shell globs the expansion of
which will include subdirectories (thus resulting in error
messages), use find(1) and its `-exec' operand.
---
contrib/chem/ChangeLog | 8 ++++++++
contrib/chem/Makefile.sub | 10 ++++------
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog
index 3142dda..358659b 100644
--- a/contrib/chem/ChangeLog
+++ b/contrib/chem/ChangeLog
@@ -1,5 +1,13 @@
2014-03-29 Steffen Nurpmeso <address@hidden>
+ * Makefile.sub (install_examples): Use `find', not shell globs.
+
+ Instead of using rm(1) two times with shell globs the expansion of
+ which will include subdirectories (thus resulting in error
+ messages), use find(1) and its `-exec' operand.
+
+2014-03-29 Steffen Nurpmeso <address@hidden>
+
* Makefile.sub: Handle examples separately, controlled by
$(make{_,_install_,_uninstall_}examples).
diff --git a/contrib/chem/Makefile.sub b/contrib/chem/Makefile.sub
index bfc7a63..28d1b86 100644
--- a/contrib/chem/Makefile.sub
+++ b/contrib/chem/Makefile.sub
@@ -6,7 +6,7 @@
# Free Software Foundation, Inc.
# Written by Bernd Warken <address@hidden>.
-# Last update: 29 Mar 2014
+# Last update: 30 Mar 2014
# This file is part of `chem' which is part of `groff'.
@@ -79,14 +79,12 @@ install_examples: install_always examples
|| $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem
-test -d $(DESTDIR)$(exampledir)/chem/122 \
|| $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
- -$(RM) $(DESTDIR)$(exampledir)/chem/*
- $(INSTALL_DATA) examples/README \
- $(DESTDIR)$(exampledir)/chem/README
+ -find $(DESTDIR)$(exampledir)/chem -type f -exec rm -f '{}' ';'
+ $(INSTALL_DATA) examples/README $(DESTDIR)$(exampledir)/chem/README
for i in $(srcdir)/examples/*.chem; do \
n=`echo $$i | sed 's|$(srcdir)/examples/||g'`; \
$(INSTALL_DATA) $$i $(DESTDIR)$(exampledir)/chem/$$n; \
- done
- -$(RM) $(DESTDIR)$(exampledir)/chem/122/*
+ done
$(INSTALL_DATA) examples/122/README \
$(DESTDIR)$(exampledir)/chem/122/README
for i in $(srcdir)/examples/122/*.chem; do \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 03/09: Makefile.sub (install_examples): Use `find', not shell globs.,
Werner LEMBERG <=