Skip to content
Browse files

Makefiles & release date (May 3)

git-svn-id: https://svn.r-project.org/R/branches/R-0-61-patches@1147 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information...
1 parent db09938 commit 071649de82749cad0263dd35a63f754374bd7968 pd committed May 2, 1998
Showing with 55 additions and 46 deletions.
  1. +6 −0 CHANGES
  2. +10 −9 Makefile
  3. +3 −3 configure
  4. +3 −3 configure.in
  5. +7 −5 etc/Makefile
  6. +24 −24 src/Makefile
  7. +2 −2 src/library/Makefile
View
6 CHANGES
@@ -6,6 +6,12 @@ NEW FEATURES
BUG FIXES
+ o Remove "Alpha" revision from opening blurb. Didn't make sense
+ with our development model
+
+ o set SHELL=/bin/sh in Makefile and use $(MAKE). Avoid use of
+ wildcards in $(MANSRC) for non-gnu "make" (notably Solaris).
+
o rhyper gave wrong results in degenerate cases
o Using get with pos=length(search()) or envir=NULL was
View
19 Makefile
@@ -1,8 +1,9 @@
####---- Master Makefile for R --- this is NOT made by configure ---
+SHELL=/bin/sh
install: config.status
@echo Building/Installing R
- cd src; make install
+ cd src; $(MAKE) install
@echo; echo You should; echo " make docs"
@echo "now, or at least";echo " make help"; echo
@@ -15,7 +16,7 @@ html: build-html
latex: build-latex
build-docs build-help build-latex build-html test-Examples:
- -@cd etc; make $@
+ -@cd etc; MANSRC=`echo ../src/library/*/man/*.Rd` $(MAKE) $@
tests: test-Examples
@@ -24,12 +25,12 @@ patches:
clean:
@echo "Cleaning at top level"
- @cd demos/dynload; make $@
- @echo "Cleaning ./etc/"; cd etc; make $@
- @echo "Cleaning the source tree"; cd src; make $@
+ @cd demos/dynload; $(MAKE) $@
+ @echo "Cleaning ./etc/"; cd etc; $(MAKE) $@
+ @echo "Cleaning the source tree"; cd src; $(MAKE) $@
moreclean: clean acclean
- @echo "More Cleaning ./etc/"; cd etc; make $@
+ @echo "More Cleaning ./etc/"; cd etc; $(MAKE) $@
acclean:
@echo cleaning configure files
@@ -42,6 +43,6 @@ realclean: acclean
@-rm -f bin/R*
@-rm -rf `echo library/* | sed 's@library/CVS *@@'`
@-rm -f doc/manual/pkg-*
- @cd demos/dynload; make $@
- @echo "Realcleaning ./etc"; cd etc; make $@
- @echo "Realcleaning the source tree"; cd src; make $@
+ @cd demos/dynload; $(MAKE) $@
+ @echo "Realcleaning ./etc"; cd etc; $(MAKE) $@
+ @echo "Realcleaning the source tree"; cd src; $(MAKE) $@
View
6 configure
@@ -567,19 +567,19 @@ cat >> confdefs.h <<\EOF
EOF
cat >> confdefs.h <<\EOF
-#define R_STATUS "Alpha"
+#define R_STATUS ""
EOF
cat >> confdefs.h <<\EOF
#define R_STATUS_REV "0"
EOF
cat >> confdefs.h <<\EOF
-#define R_DAY "NN"
+#define R_DAY "3"
EOF
cat >> confdefs.h <<\EOF
-#define R_MONTH "XXXX"
+#define R_MONTH "May"
EOF
cat >> confdefs.h <<\EOF
View
6 configure.in
@@ -22,10 +22,10 @@ host_os=$3
AC_DEFINE(R_MAJOR, "0")
AC_DEFINE(R_MINOR, "61.3")
-AC_DEFINE(R_STATUS, "Alpha")
+AC_DEFINE(R_STATUS, "")
AC_DEFINE(R_STATUS_REV, "0")
-AC_DEFINE(R_DAY, "NN")
-AC_DEFINE(R_MONTH, "XXXX")
+AC_DEFINE(R_DAY, "3")
+AC_DEFINE(R_MONTH, "May")
AC_DEFINE(R_YEAR, "1998")
AC_DEFINE_UNQUOTED(R_PLATFORM, "${host}")
AC_DEFINE_UNQUOTED(R_CPU, "${host_cpu}")
View
12 etc/Makefile
@@ -7,7 +7,9 @@ CleanMe2 = Rdconv Rdindex Rman2Rd Sd2Rd
CleanMe3 = build-help build-htmlpkglist help.pretty html2dos
CleanMe = $(CleanMe1) $(CleanMe2) $(CleanMe3)
-MANSRC = ../src/library/*/man/*.Rd
+### The following line was confusing Solaris "make". If your "make" is
+### confused now, you may want to try re-enabling it...
+#MANSRC = ../src/library/*/man/*.Rd
MANbaseDIR = ../src/library/base/man
MANdest= ../doc/manual
@@ -22,7 +24,7 @@ tests: test-Examples
test-Examples: $(Ex_Tests)
@cp -p Makefile-test-Ex $(Ex_Tests)/Makefile
- -(cd $(Ex_Tests); make $@)
+ -(cd $(Ex_Tests); $(MAKE) $@)
stamp-help: $(MANSRC)
@echo "Building ALL help pages"
@@ -49,14 +51,14 @@ stamp-docs: $(MANSRC)
@touch stamp-latex
$(DVI): stamp-latex
- -(cd $(MANdest); make Man.dvi)
+ -(cd $(MANdest); $(MAKE) Man.dvi)
$(Ex_Tests):
@if [ ! -d $@ ]; then mkdir -p $@ ; fi
clean:
- -(cd $(MANdest); make $@)
- @-(cd $(Ex_Tests) && make $@)
+ -(cd $(MANdest); $(MAKE) $@)
+ @-(cd $(Ex_Tests) && $(MAKE) $@)
moreclean: clean
@rm -f $(CleanMe1)
View
48 src/Makefile
@@ -1,36 +1,36 @@
build:
@echo extracting foreign function symbols
@sh GETSYMBOLS
- cd graphics; make
- cd math; make
- cd appl; make
- cd unix; make
- cd main; make
- cd include; make
+ cd graphics; $(MAKE)
+ cd math; $(MAKE)
+ cd appl; $(MAKE)
+ cd unix; $(MAKE)
+ cd main; $(MAKE)
+ cd include; $(MAKE)
install: build
- @cd main; make install
- @cd library; make
- @cd library; make libs
- @cd front; make
+ @cd main; $(MAKE) install
+ @cd library; $(MAKE)
+ @cd library; $(MAKE) libs
+ @cd front; $(MAKE)
clean:
- @cd graphics; make $@
- @cd library; make $@
- @cd main; make $@
- @cd math; make $@
- @cd appl; make $@
- @cd unix; make $@
+ @cd graphics; $(MAKE) $@
+ @cd library; $(MAKE) $@
+ @cd main; $(MAKE) $@
+ @cd math; $(MAKE) $@
+ @cd appl; $(MAKE) $@
+ @cd unix; $(MAKE) $@
@-rm -f lib/*.a
realclean:
- @cd front; make $@
- @cd graphics; make $@
- @cd library; make clean
- @cd main; make $@
- @cd math; make $@
- @cd appl; make $@
- @cd unix; make $@
- @cd include; make $@
+ @cd front; $(MAKE) $@
+ @cd graphics; $(MAKE) $@
+ @cd library; $(MAKE) clean
+ @cd main; $(MAKE) $@
+ @cd math; $(MAKE) $@
+ @cd appl; $(MAKE) $@
+ @cd unix; $(MAKE) $@
+ @cd include; $(MAKE) $@
@-rm -f include/FFDecl.h include/FFTab.h include/Platform.h
@-rm -f lib/*.a
View
4 src/library/Makefile
@@ -1,6 +1,6 @@
all:
- @cd base; make
- @cd profile; make
+ @cd base; $(MAKE)
+ @cd profile; $(MAKE)
libs:
@echo Building application libraries..

0 comments on commit 071649d

Please sign in to comment.
Something went wrong with that request. Please try again.