Remove bin/proofgeneral and Update Makefiles accordingly.

Closes ProofGeneral/PG#177

1 files changed, 4 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index 78e4394f..c629a4bc 100644
--- a/Makefile
+++ b/Makefile
@@ -46,16 +46,11 @@ DOC_SUBDIRS=${DOC_EXAMPLES} */README* */CHANGES */BUGS
 BATCHEMACS=${EMACS} --batch --no-site-file -q 
 
 # Scripts to edit paths to shells
-BASH_SCRIPTS = isar/interface bin/proofgeneral
+BASH_SCRIPTS = isar/interface
 PERL_SCRIPTS = lego/legotags coq/coqtags isar/isartags
-# Scripts to edit path to PG
-# the scripts target (part of install) and the cleanscripts target
-# (part of clean) work only under the assumption that PG_SCRIPTS is a subset of
-# the union of BASH_SCRIPTS and PERL_SCRIPTS.
-PG_SCRIPTS = bin/proofgeneral
 
 # Scripts to install to bin directory
-BIN_SCRIPTS = bin/proofgeneral lego/legotags coq/coqtags isar/isartags
+BIN_SCRIPTS = lego/legotags coq/coqtags isar/isartags
 
 # Setting load path might be better in Elisp, but seems tricky to do
 # only during compilation.  Another idea: put a function in proof-site
@@ -236,7 +231,7 @@ doc.%: FORCE
 ## scripts: try to patch bash and perl scripts with correct paths
 ##
 .PHONY: scripts
-scripts: bashscripts perlscripts pgscripts
+scripts: bashscripts perlscripts
 
 .PHONY: bashscripts
 bashscripts:
@@ -260,18 +255,10 @@ perlscripts:
 	   sed -i.orig "s|^#.*!.*/bin/perl.*$$|#!$$perl|" $$i; \
 	 done)
 
-# FIXME: this next edit is really for install case, shouldn't be made
-# just when user types 'make'
-.PHONY: pgscripts
-pgscripts: bashscripts perlscripts
-	(for i in $(PG_SCRIPTS); do \
-	   sed -i.rm "s|PGHOMEDEFAULT=.*$$|PGHOMEDEFAULT=${DEST_ELISP}|" $$i; \
-	 done)
-
 # Set PGHOME path in scripts back to default location.
 .PHONY: cleanscripts
 cleanscripts:
-	(for i in $(PG_SCRIPTS) $(BASH_SCRIPTS) $(PERL_SCRIPTS); do \
+	(for i in $(BASH_SCRIPTS) $(PERL_SCRIPTS); do \
 	   if [ -f $$i.rm ] ; then \
 	     rm -f $$i.rm; \
 	   fi; \