summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwl <wl>2010-12-13 15:12:40 +0000
committerwl <wl>2010-12-13 15:12:40 +0000
commite9d644ce58b720c0028541bdc5446e2f132df850 (patch)
tree9b1d9183ceb0041c963daeb1219a55068b04c17d
parent2262217705247ae443e9016cb467dac9ecf49f8d (diff)
downloadgroff-e9d644ce58b720c0028541bdc5446e2f132df850.tar.gz
Really fix handling of examples/122.
* examples/122/README: Renamed to... * examples/122/README.txt: This. * Makefile.sub (all): Add `examples/122/README'. (examples/122/README): New target. (install_data): Fix typo.
-rw-r--r--contrib/chem/ChangeLog11
-rw-r--r--contrib/chem/Makefile.sub16
-rw-r--r--contrib/chem/examples/122/README.txt (renamed from contrib/chem/examples/122/README)0
3 files changed, 24 insertions, 3 deletions
diff --git a/contrib/chem/ChangeLog b/contrib/chem/ChangeLog
index 13e9b1c2..3e6c54fa 100644
--- a/contrib/chem/ChangeLog
+++ b/contrib/chem/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-13 Werner LEMBERG <wl@gnu.org>
+
+ Really fix handling of examples/122.
+
+ * examples/122/README: Renamed to...
+ * examples/122/README.txt: This.
+
+ * Makefile.sub (all): Add `examples/122/README'.
+ (examples/122/README): New target.
+ (install_data): Fix typo.
+
2010-06-02 Larry Jones <lawrence.jones@siemens.com>
* Makefile.sub (install): Fix handling of examples/122.
diff --git a/contrib/chem/Makefile.sub b/contrib/chem/Makefile.sub
index b6a19b71..c79da488 100644
--- a/contrib/chem/Makefile.sub
+++ b/contrib/chem/Makefile.sub
@@ -5,7 +5,7 @@
# Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
# Written by Bernd Warken.
-# Last update: 2 Jun 2010
+# Last update: 12 Dec 2010
# This file is part of `chem' which is part of `groff'.
@@ -30,7 +30,12 @@ MOSTLYCLEANADD=chem chem.n README examples/README
# not all make programs have $(RM) predefined.
RM=rm -f
-all: README examples/README chem $(MAN1)
+all: \
+ README \
+ examples/README \
+ examples/122/README \
+ chem \
+ $(MAN1)
README: $(srcdir)/README.txt
sed -e "s|@g@|$(g)|g" $? >$@
@@ -39,6 +44,11 @@ examples/README: $(srcdir)/examples/README.txt
-test -d examples || $(mkinstalldirs) examples
sed -e "s|@g@|$(g)|g" $? >$@
+examples/122/README: $(srcdir)/examples/122/README.txt
+ -test -d examples || $(mkinstalldirs) examples
+ -test -d examples/122 || $(mkinstalldirs) examples/122
+ sed -e "s|@g@|$(g)|g" $? >$@
+
chem: $(srcdir)/chem.pl $(SH_DEPS_SED_SCRIPT)
sed -f "$(SH_DEPS_SED_SCRIPT)" \
-e "s|@g@|$(g)|g" \
@@ -63,7 +73,7 @@ install_data: chem \
$(INSTALL_DATA) $(srcdir)/chem.pic \
$(DESTDIR)$(datasubdir)/pic/chem.pic
-test -d $(DESTDIR)$(exampledir)/chem \
- || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
+ || $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem
-test -d $(DESTDIR)$(exampledir)/chem/122 \
|| $(mkinstalldirs) $(DESTDIR)$(exampledir)/chem/122
-$(RM) $(DESTDIR)$(exampledir)/chem/*
diff --git a/contrib/chem/examples/122/README b/contrib/chem/examples/122/README.txt
index bd51196a..bd51196a 100644
--- a/contrib/chem/examples/122/README
+++ b/contrib/chem/examples/122/README.txt