Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Moved Tmp dir location and added R scripts to makefile

  • Loading branch information...
commit 1eca35f2f5f02329bcdd10a9b5bb3383a2a50d44 1 parent 22c475a
Jared Wilkening authored June 18, 2012
1  .gitignore
@@ -6,6 +6,7 @@ site/**/*
6 6
 conf/Conf.pm
7 7
 conf/Config.pm
8 8
 conf/FIG_Config.pm
  9
+bin/*.r
9 10
 
10 11
 # ignore files with # and ~
11 12
 *\#*
4  Makefile
@@ -19,7 +19,7 @@ export TARGETDIR = $(TOPDIR)/$(TARGET)
19 19
 libdir    = $(TARGETDIR)/lib
20 20
 bindir    = $(PWD)/bin
21 21
 cgidir    = $(TARGETDIR)/CGI
22  
-tmpdir    = $(TARGETDIR)/Tmp
  22
+tmpdir    = $(cgidir)/Tmp
23 23
 srcdir    = $(PWD)/src
24 24
 
25 25
 TOOL_HDR := $(TOPDIR)/$(TARGET)/tool_hdr
@@ -64,7 +64,7 @@ lib:  Makefile $(ALL.LIB)
64 64
 clean: Makefile purge
65 65
 
66 66
 purge: 
67  
-	rm -rf $(TARGET)
  67
+	rm -rf $(TARGET) bin/*.r 
68 68
 
69 69
 
70 70
 ##
15  src/MGRAST/Makefile
@@ -46,16 +46,21 @@ INST_CGI = $(foreach var, $(PERLCGISCRIPTS), $(cgidir)/$(var))
46 46
 PERL_BIN_SRC := $(wildcard *.pl)
47 47
 PERL_BIN = $(subst .pl,, $(PERL_BIN_SRC))
48 48
 
49  
-all: lib bin
  49
+R_SCRIPTS_SRC := $(wildcard r/*.r)
  50
+R_SCRIPTS = $(subst r/,, $(R_SCRIPTS_SRC))
  51
+
  52
+all: bin
50 53
 
51 54
 show:
52 55
 	@echo cgis $(foreach var, $(PERLCGISCRIPTS), $(cgidir)/$(var))
53 56
 	@echo top $(TOPDIR)
54 57
 	@echo pkg $(PKGNAME)
55 58
 	@echo toolhdr $(TOOL_HDR)
56  
-bin: $(foreach var, $(PERL_BIN), $(bindir)/$(var))
57  
-
58  
-lib: $(INST_CGI) $(INST_PERL_LIB) copy_htaccess  $(foreach var, $(WEBPAGES), $(cgidir)/Html/$(var))
  59
+	
  60
+bin: $(foreach var, $(R_SCRIPTS), $(bindir)/$(var)) $(foreach var, $(PERL_BIN), $(bindir)/$(var)) 
  61
+	@echo R $(foreach var, $(R_SCRIPTS), $(bindir)/$(var))
  62
+	
  63
+lib: $(INST_CGI) $(INST_PERL_LIB) bin $(foreach var, $(WEBPAGES), $(cgidir)/Html/$(var))
59 64
 
60 65
 htaccess_src = $(RTROOT)/config/all.htaccess
61 66
 htaccess_dst = $(cgidir)/.htaccess
@@ -82,6 +87,8 @@ $(cgidir)/Html/%: $(TOPDIR)/src/$(PKGNAME)/%
82 87
 $(bindir)/%: $(TOPDIR)/src/$(PKGNAME)/%.pl $(TOOL_HDR)
83 88
 	( cat $(TOOL_HDR) $< > $(subt $@); chmod +x $@ )
84 89
 
  90
+$(bindir)/%.r: $(TOPDIR)/src/$(PKGNAME)/r/%.r
  91
+	cp $< $@
85 92
 
86 93
 $(libdir)/$(PKGNAME)/%.pm: %.pm
87 94
 	tgt_dir=`dirname $(subst MGRAST/lib/,MGRAST/, $@)`;  \

0 notes on commit 1eca35f

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