Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
move gnome install to R_HOME/gnome
git-svn-id: https://svn.r-project.org/R/trunk@9080 00db46b3-68df-0310-9c12-caf00c1e9a41
  • Loading branch information
ripley committed May 6, 2000
1 parent f72cd3a commit d57d433
Show file tree
Hide file tree
Showing 6 changed files with 26 additions and 17 deletions.
10 changes: 6 additions & 4 deletions Makefile.in
Expand Up @@ -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$$' \
Expand Down Expand Up @@ -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}; \
Expand Down
19 changes: 11 additions & 8 deletions NEWS
Expand Up @@ -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().

Expand Down Expand Up @@ -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.
Expand All @@ -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
Expand Down Expand Up @@ -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


Expand Down
3 changes: 2 additions & 1 deletion etc/Makefile.in
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/unix/dynload.c
Expand Up @@ -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");
Expand Down
7 changes: 5 additions & 2 deletions src/unix/gnome/Makefile.in
Expand Up @@ -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

Expand All @@ -66,14 +66,17 @@ Makedeps: Makefile $(DEPENDS)
@cat $(DEPENDS) >> Makefile
@touch $@

R DLLs: Makefile
R DLLs: Makefile gnomedir
@$(MAKE) Makedeps
@$(MAKE) $(SHLIB)

$(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)"
Expand Down
2 changes: 1 addition & 1 deletion src/unix/gnome/terminal.h
Expand Up @@ -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;
Expand Down

0 comments on commit d57d433

Please sign in to comment.