Permalink
Browse files

Moved Tmp dir location and added R scripts to makefile

  • Loading branch information...
1 parent 22c475a commit 1eca35f2f5f02329bcdd10a9b5bb3383a2a50d44 @jaredwilkening jaredwilkening committed Jun 18, 2012
Showing with 14 additions and 6 deletions.
  1. +1 −0 .gitignore
  2. +2 −2 Makefile
  3. +11 −4 src/MGRAST/Makefile
View
@@ -6,6 +6,7 @@ site/**/*
conf/Conf.pm
conf/Config.pm
conf/FIG_Config.pm
+bin/*.r
# ignore files with # and ~
*\#*
View
@@ -19,7 +19,7 @@ export TARGETDIR = $(TOPDIR)/$(TARGET)
libdir = $(TARGETDIR)/lib
bindir = $(PWD)/bin
cgidir = $(TARGETDIR)/CGI
-tmpdir = $(TARGETDIR)/Tmp
+tmpdir = $(cgidir)/Tmp
srcdir = $(PWD)/src
TOOL_HDR := $(TOPDIR)/$(TARGET)/tool_hdr
@@ -64,7 +64,7 @@ lib: Makefile $(ALL.LIB)
clean: Makefile purge
purge:
- rm -rf $(TARGET)
+ rm -rf $(TARGET) bin/*.r
##
View
@@ -46,16 +46,21 @@ INST_CGI = $(foreach var, $(PERLCGISCRIPTS), $(cgidir)/$(var))
PERL_BIN_SRC := $(wildcard *.pl)
PERL_BIN = $(subst .pl,, $(PERL_BIN_SRC))
-all: lib bin
+R_SCRIPTS_SRC := $(wildcard r/*.r)
+R_SCRIPTS = $(subst r/,, $(R_SCRIPTS_SRC))
+
+all: bin
show:
@echo cgis $(foreach var, $(PERLCGISCRIPTS), $(cgidir)/$(var))
@echo top $(TOPDIR)
@echo pkg $(PKGNAME)
@echo toolhdr $(TOOL_HDR)
-bin: $(foreach var, $(PERL_BIN), $(bindir)/$(var))
-
-lib: $(INST_CGI) $(INST_PERL_LIB) copy_htaccess $(foreach var, $(WEBPAGES), $(cgidir)/Html/$(var))
+
+bin: $(foreach var, $(R_SCRIPTS), $(bindir)/$(var)) $(foreach var, $(PERL_BIN), $(bindir)/$(var))
+ @echo R $(foreach var, $(R_SCRIPTS), $(bindir)/$(var))
+
+lib: $(INST_CGI) $(INST_PERL_LIB) bin $(foreach var, $(WEBPAGES), $(cgidir)/Html/$(var))
htaccess_src = $(RTROOT)/config/all.htaccess
htaccess_dst = $(cgidir)/.htaccess
@@ -82,6 +87,8 @@ $(cgidir)/Html/%: $(TOPDIR)/src/$(PKGNAME)/%
$(bindir)/%: $(TOPDIR)/src/$(PKGNAME)/%.pl $(TOOL_HDR)
( cat $(TOOL_HDR) $< > $(subt $@); chmod +x $@ )
+$(bindir)/%.r: $(TOPDIR)/src/$(PKGNAME)/r/%.r
+ cp $< $@
$(libdir)/$(PKGNAME)/%.pm: %.pm
tgt_dir=`dirname $(subst MGRAST/lib/,MGRAST/, $@)`; \

0 comments on commit 1eca35f

Please sign in to comment.