diff --git a/Makefile.in b/Makefile.in index 366a3af0aed..46b8be3c52b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -63,10 +63,11 @@ install: installdirs @sed "s@R_HOME=.*@R_HOME=$(rhome)\}@" < bin/R > $(rhome)/bin/R @sed "s@R_HOME=.*@R_HOME=$(rhome)\}@" < bin/R > $(bindir)/R @chmod 755 $(bindir)/R $(rhome)/bin/R - @if test -n "$(R_GUIS)"; then \ - for g in $(R_GUIS); do \ - $(INSTALL_PROGRAM) bin/R_$${g}.$(SHLIBEXT) $(rhome)/bin; \ - done; \ + @for f in `ls bin/*.$(SHLIBEXT)`; do \ + $(INSTALL_PROGRAM) $${f} $(rhome)/bin; \ + done + @if test -n "$(GNOMEUI_LIBS)"; then \ + $(INSTALL_PROGRAM) gnome/R_gnome.$(SHLIBEXT) $(rhome)/gnome; \ fi @for f in `find bin -type f -print \ | grep -v '^bin/R$$' \ @@ -112,6 +113,7 @@ uninstall: @rm -rf $(rhome)/include @echo "uninstalling executables ..." @rm -rf $(rhome)/bin + @rm -rf $(rhome)/gnome @rm -f $(bindir)/R @for f in $(INSTFILES); do \ rm -f $(rhome)/$${f}; \ diff --git a/NEWS b/NEWS index ee872267999..ddb378b7bd8 100644 --- a/NEWS +++ b/NEWS @@ -13,9 +13,9 @@ NEW FEATURES o attach() now works for R data files. - o R (under Unix) can be sent SIGUSR1 to quit and - save or SIGUSR2 to quit and save without running .Last and - on.exit expressions. + o R (under Unix) can be sent SIGUSR1 to quit and save or SIGUSR2 + to quit and save without running .Last and on.exit + expressions. o Option for user-supplied normal random generator in RNGkind(). @@ -61,8 +61,7 @@ NEW FEATURES and postscript() and functions that use them (for example, write()). o postscript(print.it=TRUE) now does print the plot file. - - o postscript(onefile=FALSE) now produces multiple separate files. + postscript(onefile=FALSE) now produces multiple separate files. o image() has a new argument "breaks" and divides the zlim range into equal-length intervals. @@ -86,6 +85,9 @@ NEW FEATURES (The gnome() device remains unreliable, and is by default unavailable.) + All GNOME support now installs in R_HOME/gnome to make it + easier to package separately. + o New device xfig() to produce XFig files. o Added ability to use the graphics device driver to perform @@ -189,20 +191,21 @@ BUG FIXES o Linpack.h now makes clear which routines are actually in R. o The X11 data editor scrolls cells and so allows more than ca 10 - characters to be entered. + characters to be entered. Several interface/redraw errors + have been corrected. o rpois(*, lambda) now works when lambda > .Machine$integer.max o keep.source was not set correctly before the base package was - loaded, some functions in the base package had the source + loaded: some functions in the base package had the source kept. The memory usage should now be reduced by ca 1Mb. o M <- 2 ; print(ppr(.., nterms = M)) now works. - o predict(,type="terms",se.fit=T) gives correct standard errors (thanks to John Maindonald) + CHANGES IN R VERSION 1.0.1 diff --git a/etc/Makefile.in b/etc/Makefile.in index 004cfcfacdd..14980b18756 100644 --- a/etc/Makefile.in +++ b/etc/Makefile.in @@ -53,8 +53,9 @@ install-perl: done install-gnome: @if test -n "$(GNOME_IF_FILES)"; then \ + $(MKINSTALLDIRS) $(rhome)/gnome ;\ for f in "$(GNOME_IF_FILES)"; do \ - $(INSTALL_DATA) $(srcdir)/$${f} $(rhome)/etc; \ + $(INSTALL_DATA) $(srcdir)/$${f} $(rhome)/gnome; \ done; \ fi install-strip: install diff --git a/src/unix/dynload.c b/src/unix/dynload.c index 2cb7636320e..702e93cde86 100644 --- a/src/unix/dynload.c +++ b/src/unix/dynload.c @@ -486,7 +486,7 @@ void R_load_gnome_shlib() struct stat sb; strcpy(gnome_DLL, getenv("R_HOME")); - strcat(gnome_DLL, "/bin/R_gnome."); + strcat(gnome_DLL, "/gnome/R_gnome."); strcat(gnome_DLL, SHLIBEXT); /* from config.h */ if(stat(gnome_DLL, &sb)) R_Suicide("Probably no GNOME support: the shared library was not found"); diff --git a/src/unix/gnome/Makefile.in b/src/unix/gnome/Makefile.in index 80823718f17..0d5ecace849 100644 --- a/src/unix/gnome/Makefile.in +++ b/src/unix/gnome/Makefile.in @@ -51,7 +51,7 @@ HEADERS = \ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) DISTFILES = Makefile.in $(SOURCES) $(HEADERS) -SHLIB = $(top_builddir)/bin/R_gnome.$(SHLIBEXT) +SHLIB = $(top_builddir)/gnome/R_gnome.$(SHLIBEXT) all: Makefile Makedeps R @@ -66,7 +66,7 @@ Makedeps: Makefile $(DEPENDS) @cat $(DEPENDS) >> Makefile @touch $@ -R DLLs: Makefile +R DLLs: Makefile gnomedir @$(MAKE) Makedeps @$(MAKE) $(SHLIB) @@ -74,6 +74,9 @@ $(SHLIB): $(OBJECTS) $(SHLIBLD) $(SHLIBLDFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) \ $(ALL_GNOME_LIBS) $(ALL_X_LIBS) +gnomedir: + @$(MKINSTALLDIRS) $(top_builddir)/gnome + mostlyclean: clean clean: @echo "cleaning in $(subdir)" diff --git a/src/unix/gnome/terminal.h b/src/unix/gnome/terminal.h index 2033374d3a2..c4cecd4bae9 100644 --- a/src/unix/gnome/terminal.h +++ b/src/unix/gnome/terminal.h @@ -25,7 +25,7 @@ #include "gtkconsole.h" -#define GLADE_INTERFACE_FILE "%s/etc/gnome-interface.glade" +#define GLADE_INTERFACE_FILE "%s/gnome/gnome-interface.glade" GtkWidget *R_gtk_main_window; GtkWidget *R_gtk_terminal_text;