2001-03-28 H.J. Lu <hjl@gnu.org>

	* Makefile.am ($(srcdir)/dlltool.1): Remove the extra target.
	* Makefile.in: Regenerate.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 27a734a..ad1d956 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-28  H.J. Lu  <hjl@gnu.org>
+
+       * Makefile.am ($(srcdir)/dlltool.1): Remove the extra target.
+       * Makefile.in: Regenerate.
+
 2001-03-26  Andreas Jaeger  <aj@suse.de>
 
        * binutils.texi (nm): Fix texi syntax.

diff --git a/binutils/Makefile.am b/binutils/Makefile.am
index 7d680dd..ebe32f4 100644 (file)
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -381,13 +381,6 @@ $(srcdir)/dlltool.1:       $(srcdir)/binutils.texi
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        rm -f $@.pod
 
-$(srcdir)/dlltool.1:   $(srcdir)/binutils.texi
-       touch $@
-       -$(TEXI2POD) $(MANCONF) -Ddlltool < $< > $@.pod
-       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
-               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
-       rm -f $@.pod
-
 $(srcdir)/nlmconv.1:   $(srcdir)/binutils.texi
        touch $@
        -$(TEXI2POD) $(MANCONF) -Dnlmconv < $< > $@.pod

diff --git a/binutils/Makefile.in b/binutils/Makefile.in
index ed66c36..a61e1c4 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -906,7 +906,7 @@ distdir: $(DISTFILES)
        @for file in $(DISTFILES); do \
          if test -f $$file; then d=.; else d=$(srcdir); fi; \
          if test -d $$d/$$file; then \
-           cp -pr $$/$$file $(distdir)/$$file; \
+           cp -pr $$d/$$file $(distdir)/$$file; \
          else \
            test -f $(distdir)/$$file \
            || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -1230,13 +1230,6 @@ $(srcdir)/dlltool.1:     $(srcdir)/binutils.texi
                mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
        rm -f $@.pod
 
-$(srcdir)/dlltool.1:   $(srcdir)/binutils.texi
-       touch $@
-       -$(TEXI2POD) $(MANCONF) -Ddlltool < $< > $@.pod
-       -($(POD2MAN) $@.pod | sed -e '/^.if n .na/d' > $@.T$$$$ && \
-               mv -f $@.T$$$$ $@) || (rm -f $@.T$$$$ && exit 1)
-       rm -f $@.pod
-
 $(srcdir)/nlmconv.1:   $(srcdir)/binutils.texi
        touch $@
        -$(TEXI2POD) $(MANCONF) -Dnlmconv < $< > $@.pod