From 91dbe31ccc2c7855ae152ecfe79b3b17b0bc54a0 Mon Sep 17 00:00:00 2001
From: Claus Reinke <claus.reinke@talk21.com>
Date: Sun, 11 Sep 2011 22:36:58 +0200
Subject: [PATCH] configurable NARCISSUS; don't mess with ~/.profile

- allow installation to use different narcissus sources
- do not touch ~/.profile
---
 Makefile | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 3e1c43d..efb8ba5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
 PREFIX=/usr/local
 INSTALL=install
 NODE=node
-PROFILE=~/.profile
 
+NARCISSUS=narcissus
 BIN_SRC=$(addprefix bin/,jsctags.js)
 LIB_SRC=$(addprefix lib/jsctags/,getopt.js log.js paperboy.js traits.js \
 	underscore.js)
 LIB_CTAGS_SRC=$(addprefix lib/jsctags/ctags/,index.js interp.js nativefn.js \
 	reader.js writer.js)
 LIB_CFA2_SRC=$(addprefix lib/cfa2/,index.js jscfa.js)
-LIB_NARCISSUS_SRC=$(addprefix narcissus/lib/,../main.js decompiler.js \
+LIB_NARCISSUS_SRC=$(addprefix $(NARCISSUS)/lib/,../main.js decompiler.js \
 	definitions.js desugaring.js jsbrowser.js jsdecomp.js jsdefs.js \
 	jsdesugar.js jsexec.js jslex.js jsparse.js jsresolve.js \
 	lexer.js parser.js)
@@ -26,18 +26,13 @@ install:
 	$(INSTALL) -d $(PREFIX)/narcissus
 	$(INSTALL) -d $(PREFIX)/narcissus/lib
 	$(INSTALL) $(LIB_NARCISSUS_SRC) $(PREFIX)/narcissus/lib
-	echo "export NODE_PATH=$(PREFIX)/lib/jsctags/:\$$NODE_PATH" >> $(PROFILE)
 	@echo "\nIf you want to use jsctags right here, right now,\n\
-	please type this in your terminal:\n\n\
-	    . $(PROFILE)\n"
+	please type this in your terminal:\n\n"
+	@echo "export NODE_PATH=$(PREFIX)/lib/jsctags/:\$$NODE_PATH"
 
 uninstall:
 	rm -rf $(BIN_SRC:%.js=$(PREFIX)/%) $(PREFIX)/lib/jsctags \
 	  $(PREFIX)/lib/cfa2 $(PREFIX)/narcissus
-	cp $(PROFILE) $(PROFILE).bak
-	sed -e "s,^export NODE_PATH=$(PREFIX)/lib/jsctags/:\$$NODE_PATH$$,,g" \
-	  < $(PROFILE) > $(PROFILE)-tmp
-	mv $(PROFILE)-tmp $(PROFILE)
 
 serve:
 	$(NODE) serve.js