Permalink
Browse files

Teach make dist to exclude .svn subdirs.

git-svn-id: https://svn.r-project.org/R/trunk@30438 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent d42f2df commit b9368b1a00cdb85a1b85bbdfb5c6e4b383e17b97 hornik committed Aug 2, 2004
View
@@ -20,7 +20,7 @@ CFLAGS = @CFLAGS@
CPICFLAGS = @CPICFLAGS@
CPPFLAGS = @CPPFLAGS@
DEFS = @DEFS@
-DISTDIR_TAR_EXCLUDE = --exclude=CVS --exclude=Makefile --exclude="*.o" --exclude="*$(SHLIB_EXT)"
+DISTDIR_TAR_EXCLUDE = --exclude=.svn --exclude=CVS --exclude=Makefile --exclude="*.o" --exclude="*$(SHLIB_EXT)"
DVIPS = @DVIPS@
DYLIB_EXT = @DYLIB_EXT@
DYLIB_LD = @DYLIB_LD@
View
@@ -155,7 +155,7 @@ distdir: $(DISTFILES)
|| exit 1; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
- ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ ((cd $(srcdir); $(TAR) -c -f - $(DISTDIR_TAR_EXCLUDE) $${d}) \
| (cd $(distdir); $(TAR) -x -f -)) \
|| exit 1; \
done
View
@@ -425,7 +425,7 @@ distdir: $(DISTFILES)
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
- ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ ((cd $(srcdir); $(TAR) -c -f - $(DISTDIR_TAR_EXCLUDE) $${d}) \
| (cd $(distdir); $(TAR) -x -f -)) \
|| exit 1; \
done
View
@@ -100,7 +100,7 @@ distdir: $(DISTFILES)
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
- ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ ((cd $(srcdir); $(TAR) -c -f - $(DISTDIR_TAR_EXCLUDE) $${d}) \
| (cd $(distdir); $(TAR) -x -f -)) \
|| exit 1; \
done
View
@@ -52,7 +52,7 @@ distdir: $(DISTFILES)
|| exit 1; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
- ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ ((cd $(srcdir); $(TAR) -c -f - --exclude=.svn --exclude=CVS $${d}) \
| (cd $(distdir); $(TAR) -x -f -)) \
|| exit 1; \
done
View
@@ -61,7 +61,7 @@ distdir: $(DISTFILES)
|| exit 1; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
- ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ ((cd $(srcdir); $(TAR) -c -f - $(DISTDIR_TAR_EXCLUDE) $${d}) \
| (cd $(distdir); $(TAR) -x -f -)) \
|| exit 1; \
done
@@ -74,7 +74,7 @@ distdir: $(DISTFILES)
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
- ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ ((cd $(srcdir); $(TAR) -c -f - $(DISTDIR_TAR_EXCLUDE) $${d}) \
| (cd $(distdir); $(TAR) -x -f -)) \
|| exit 1; \
done
View
@@ -121,7 +121,7 @@ distdir: $(DISTFILES)
|| exit 1; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
- ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ ((cd $(srcdir); $(TAR) -c -f - $(DISTDIR_TAR_EXCLUDE) $${d}) \
| (cd $(distdir); $(TAR) -x -f -)) \
|| exit 1; \
done
@@ -90,7 +90,7 @@ distdir: $(DISTFILES)
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
- ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ ((cd $(srcdir); $(TAR) -c -f - $(DISTDIR_TAR_EXCLUDE) $${d}) \
| (cd $(distdir); $(TAR) -x -f -)) \
|| exit 1; \
done
View
@@ -113,7 +113,7 @@ distdir: $(DISTFILES)
|| cp -p $(srcdir)/$${f} $(distdir)/$${f}; \
done
@for d in $(SUBDIRS_WITH_NO_BUILD); do \
- ((cd $(srcdir); $(TAR) -c -f - --exclude=CVS $${d}) \
+ ((cd $(srcdir); $(TAR) -c -f - $(DISTDIR_TAR_EXCLUDE) $${d}) \
| (cd $(distdir); $(TAR) -x -f -)) \
|| exit 1; \
done
View
@@ -20,7 +20,7 @@ SCRIPTS_B = $(SCRIPTS_B_IN:.in=)
## </NOTE>
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-DISTFILES = Makefile.in $(SCRIPTS_S) $(SCRIPTS_B_IN) R.sh.in
+DISTFILES = Makefile.in Makefile.win $(SCRIPTS_S) $(SCRIPTS_B_IN) R.sh.in
CLEANFILES =
DISTCLEANFILES = Makefile R.fe R.sh $(SCRIPTS_B)

0 comments on commit b9368b1

Please sign in to comment.