Ignore:
Timestamp:
Jun 28, 2013 1:38:04 PM (8 years ago)
Author:
gah
Message:

Fix R build so that it can be cleaned or reinstalled

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/lang/R/Makefile.in

    r3717 r3725  
    2323coresrcdir      = ${PWD}/../../rappture/src/core
    2424corelibdir      = ${PWD}/../src/core
    25 R_flags         = --configure-args='--with-rappture-include=$(coresrcdir)\
    26                                     --with-rappture-lib=$(corelibdir)'
     25R_flags         = --configure-args='--with-rappture-include=$(includedir)\
     26                                    --with-rappture-lib=$(libdir)'
    2727
    28 Rlib            = $(libdir)/R
     28RLIB            = R
    2929
    3030#       $(MKDIR_P) -m 0755 ${PWD}/build
    3131#       tar -C ${PWD}/build -clf - . | tar -C $(Rlib) -xpf -
    3232
    33 all:
    34         $(R) CMD build $(srcdir)/Rappture
    35         tar xvzf Rappture_1.0.tar.gz
     33all: $(RLIB)
    3634
    37 install:
    38         $(MKDIR_P) -m 0755 $(Rlib)
    39         $(R) CMD INSTALL $(R_flags) --library=$(Rlib) Rappture
     35$(RLIB):
     36        tar -C $(srcdir) -clf - Rappture | tar -xpf -
     37        $(MKDIR_P) -m 0755 $(RLIB)
     38        $(R) CMD build Rappture
     39        LD_LIBRARY_PATH=$(libdir) $(R) CMD INSTALL $(R_flags) --library=$(RLIB) Rappture
     40
     41install: $(RLIB)
     42        $(RM) -rf $(libdir)/$(RLIB)
     43        $(MKDIR_P) -m 0755 $(RLIB)
     44        tar -clf - $(RLIB) | tar -C $(libdir) -xpf - 
    4045
    4146clean:
    42         $(RM) -rf Rappture ${PWD}/build
     47        $(RM) -r $(RLIB)
     48        $(RM) -rf Rappture Rappture_1.0.tar.gz
    4349
    4450distclean: clean
Note: See TracChangeset for help on using the changeset viewer.