2007-03-06 Matthias Klose <doko@ubuntu.com>

        * doc/Makefile.am(gkeytool.pod): Don't use sed -i.
        * doc/Makefile.in: Regenerate.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122634 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 6bb8214..8088122 100644 (file)
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -1,3 +1,8 @@
+2007-03-06  Matthias Klose  <doko@ubuntu.com>
+
+       * doc/Makefile.am(gkeytool.pod): Don't use sed -i.
+       * doc/Makefile.in: Regenerate.
+
 2007-03-06  Tom Tromey  <tromey@redhat.com>
 
        * tools/gnu/classpath/tools/javah/Main.java (getName): New

diff --git a/libjava/classpath/doc/Makefile.am b/libjava/classpath/doc/Makefile.am
index 40b46d9..7f8d4b0 100644 (file)
--- a/libjava/classpath/doc/Makefile.am
+++ b/libjava/classpath/doc/Makefile.am
@@ -67,10 +67,10 @@ gjavah.pod: $(srcdir)/cp-tools.texinfo
 
 # hack around the cross references and the enumeration
 gkeytool.pod: $(srcdir)/cp-tools.texinfo
-       -$(TEXI2POD) -D gkeytool < $< > $@
-       sed -i -e 's/^For more details.*/See I<Common Options> for more details./' \
+       -$(TEXI2POD) -D gkeytool < $< \
+         | sed -e 's/^For more details.*/See I<Common Options> for more details./' \
            -e 's/1\.<\([^>]*\)>/- \1/' \
-               $@
+               > $@
 
 gnative2ascii.pod: $(srcdir)/cp-tools.texinfo
        -$(TEXI2POD) -D gnative2ascii < $< > $@

diff --git a/libjava/classpath/doc/Makefile.in b/libjava/classpath/doc/Makefile.in
index 753d28c..e57a0c4 100644 (file)
--- a/libjava/classpath/doc/Makefile.in
+++ b/libjava/classpath/doc/Makefile.in
@@ -721,10 +721,10 @@ gjavah.pod: $(srcdir)/cp-tools.texinfo
 
 # hack around the cross references and the enumeration
 gkeytool.pod: $(srcdir)/cp-tools.texinfo
-       -$(TEXI2POD) -D gkeytool < $< > $@
-       sed -i -e 's/^For more details.*/See I<Common Options> for more details./' \
+       -$(TEXI2POD) -D gkeytool < $< \
+         | sed -e 's/^For more details.*/See I<Common Options> for more details./' \
            -e 's/1\.<\([^>]*\)>/- \1/' \
-               $@
+               > $@
 
 gnative2ascii.pod: $(srcdir)/cp-tools.texinfo
        -$(TEXI2POD) -D gnative2ascii < $< > $@