Module: xenomai-head
Branch: master
Commit: 97a9f693dad9e78b26d88a838a5ecaa3797b3f1c
URL:    
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=97a9f693dad9e78b26d88a838a5ecaa3797b3f1c

Author: Philippe Gerum <r...@xenomai.org>
Date:   Thu May 28 16:40:54 2009 +0200

Fix dist rule

---

 doc/Makefile.am |    5 +----
 doc/Makefile.in |   10 ++--------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7e4bf8a..433ba5b 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -3,11 +3,8 @@ SUBDIRS=docbook doxygen man txt
 GENERATE_DOC=$(top_srcdir)/scripts/maint/generate-doc
 
 generate-doc:
-       @if test \! -e $(GENERATE_DOC) ; then \
+       @if test \! -e $(GENERATE_DOC) -o \! -e $(srcdir)/.git ; then \
                echo "$@ may only be run from a GIT working tree." ; \
        else \
                srcdir=$(srcdir) $(GENERATE_DOC) ; \
        fi
-
-dist-hook:
-       find $(distdir) -name .svn -depth -exec rm -fr \{\} \;
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 306acbc..edf9437 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -434,9 +434,6 @@ distdir: $(DISTFILES)
              || exit 1; \
          fi; \
        done
-       $(MAKE) $(AM_MAKEFLAGS) \
-         top_distdir="$(top_distdir)" distdir="$(distdir)" \
-         dist-hook
 check-am: all-am
 check: check-recursive
 all-am: Makefile
@@ -525,7 +522,7 @@ uninstall-am:
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
        all all-am check check-am clean clean-generic clean-libtool \
-       ctags ctags-recursive dist-hook distclean distclean-generic \
+       ctags ctags-recursive distclean distclean-generic \
        distclean-libtool distclean-tags distdir dvi dvi-am html \
        html-am info info-am install install-am install-data \
        install-data-am install-dvi install-dvi-am install-exec \
@@ -539,14 +536,11 @@ uninstall-am:
 
 
 generate-doc:
-       @if test \! -e $(GENERATE_DOC) ; then \
+       @if test \! -e $(GENERATE_DOC) -o \! -e $(srcdir)/.git ; then \
                echo "$@ may only be run from a GIT working tree." ; \
        else \
                srcdir=$(srcdir) $(GENERATE_DOC) ; \
        fi
-
-dist-hook:
-       find $(distdir) -name .svn -depth -exec rm -fr \{\} \;
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git

Reply via email to