Permalink
Browse files

update DISTFILES, tweak install from make dist tarball

git-svn-id: https://svn.r-project.org/R/trunk@31556 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent 7562ecf commit 5e24ffc447fa5c315bb3eaf3e6b0ebdfe7783d51 ripley committed Oct 22, 2004
Showing with 8 additions and 8 deletions.
  1. +3 −3 Makefile.in
  2. +3 −3 doc/html/Makefile.in
  3. +1 −1 src/modules/gnome/Makefile.in
  4. +1 −1 src/unix/Makefile.in
View
@@ -13,7 +13,7 @@ distdir = $(PACKAGE)-$(VERSION)
INSTFILES = AUTHORS COPYING COPYING.LIB COPYRIGHTS NEWS THANKS
NON_SVN_INSTFILES = FAQ RESOURCES
DISTFILES = $(INSTFILES) \
- ChangeLog INSTALL ONEWS README VERSION Y2K \
+ ChangeLog INSTALL ONEWS OONEWS README VERSION Y2K \
Makeconf.in Makefile.in \
config.site configure configure.ac \
date-stamp
@@ -97,13 +97,13 @@ install: installdirs svnonly
@WANT_R_FRAMEWORK_TRUE@ @(cp $(R_FRAMEWORK_DIR)/Resources/bin/R $(R_FRAMEWORK_DIR)/Resources/R)
svnonly:
- @if test ! -f "$(srcdir)/FAQ" -o -f non-tarball ; then \
+ @if test ! -f "$(srcdir)/FAQ" || test -f non-tarball ; then \
cd doc/manual && $(MAKE) front-matter ; \
touch non-tarball ; \
else \
if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
for f in $(NON_SVN_INSTFILES); do \
- $(INSTALL_DATA) $(srcdir)/$${f} "$(rhome)/$(subdir)"; \
+ $(INSTALL_DATA) $(srcdir)/$${f} $(top_builddir); \
done \
fi \
fi
@@ -42,13 +42,13 @@ R: Makefile $(OBJECTS) svnonly
done
svnonly:
- @if test ! -f "$(srcdir)/resources.html" -o -f non-tarball ; then \
- cd ../manual && $(MAKE) html-non-svn ; \
+ @if test ! -f "$(srcdir)/resources.html" || test -f non-tarball ; then \
+ (cd ../manual && $(MAKE) html-non-svn) ; \
touch non-tarball ; \
else \
if test "$(BUILDDIR_IS_SRCDIR)" = no ; then \
for f in $(NON_SVN_INSTFILES); do \
- $(INSTALL_DATA) $(srcdir)/$${f} $(builddir); \
+ $(INSTALL_DATA) $(srcdir)/$${f} . ; \
done \
fi \
fi
@@ -25,7 +25,7 @@ SOURCES = \
terminal-prefs.c terminal-toolbar.c terminal.c
DEPENDS = $(SOURCES:.c=.d)
OBJECTS = $(SOURCES:.c=.o)
-HEADERS = Rinterface.h system.h \
+HEADERS = system.h \
command-grep.h \
gdkrotated.h \
gnome-find-dialog.h \
@@ -19,7 +19,7 @@ SOURCES_C_DARWIN = dlfcn-darwin.c
SOURCES = $(SOURCES_C_BASE) @BUILD_DLFCN_DARWIN_TRUE@ $(SOURCES_C_DARWIN)
DEPENDS = $(SOURCES:.c=.d)
OBJECTS = $(SOURCES:.c=.o)
-HEADERS = Runix.h devUI.h hpdlfcn.h dlfcn-darwin.h
+HEADERS = Runix.h hpdlfcn.h dlfcn-darwin.h
distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
DISTFILES = \

0 comments on commit 5e24ffc

Please sign in to comment.