Remove support for encap package manager

It appears abandoned.  encap.org is down, and the last snapshot on
archive.org is from 2015.

Also, since we don't have to worry about the different values of
prefix, stop redefining it and exec_prefix (which means we do have to
include DESTDIR in a few extra places).

Author: d-torrance

M2/Macaulay2/e/Makefile.in

@@ -160,7 +160,7 @@ help:
 	@ echo ""
 	@ echo "Current configuration:"
 	@ echo "    OS=@OS@ REL=@REL@ ISSUE=@ISSUE@ ARCH=@ARCH@"
-	@ echo "    DEBUG=@DEBUG@ OPTIMIZE=@OPTIMIZE@ ENCAP=@ENCAP@"
+	@ echo "    DEBUG=@DEBUG@ OPTIMIZE=@OPTIMIZE@"
 	@ echo ""
 	@ echo "targets:"
 	@ echo "  all               build/compile all files in Macaulay2/e [the default target]"

M2/Makefile.in

@@ -134,15 +134,15 @@ announce:
 	@ echo "================================================================="
 	@ echo "    Macaulay2 version @PACKAGE_VERSION@"
 	@ echo "    OS=@OS@ ISSUE=@ISSUE@ ARCH=@ARCH@"
-	@ echo "    DEBUG=@DEBUG@ OPTIMIZE=@OPTIMIZE@ ENCAP=@ENCAP@"
+	@ echo "    DEBUG=@DEBUG@ OPTIMIZE=@OPTIMIZE@"
 	@ echo "================================================================="
 
 help:
 	@ echo "Macaulay2 version @PACKAGE_VERSION@"
 	@ echo ""
 	@ echo "make files configured with:"
 	@ echo "    OS=@OS@ ISSUE=@ISSUE@ ARCH=@ARCH@"
-	@ echo "    DEBUG=@DEBUG@ OPTIMIZE=@OPTIMIZE@ ENCAP=@ENCAP@"
+	@ echo "    DEBUG=@DEBUG@ OPTIMIZE=@OPTIMIZE@"
 	@ echo ""
 	@ echo "Macaulay2 executable location:"
 	@ echo "   @pre_bindir@/M2@EXE@"
@@ -192,7 +192,6 @@ help:
 	@ echo "                      (currently ${prefix})"
 	@ echo "  exec_prefix=...     installation prefix for architecture dependent files"
 	@ echo "                      (currently ${exec_prefix})"
-	@ echo "  ENCAP=yes           install in ${prefix}/@package@ instead"
 	@ echo "  MAPFILE=yes         create a mapfile when linking M2"
 	@ echo "  DESTDIR=/Foo/Bar    install in /Foo/Bar${prefix} instead"
 # Local Variables:

M2/configure.ac

@@ -392,7 +392,6 @@ test "$DEBUG" = "yes" && ENABLE_STRIP=no
 # note: we build many programs for inclusion in the distribution -- stripping them saves 9MB of 70
 
 AC_SUBST(MEMDEBUG,no)  AC_ARG_ENABLE(memdebug, AS_HELP_STRING(--enable-memdebug,enable memory allocation debugging), MEMDEBUG=$enableval)
-AC_SUBST(ENCAP,no)     AC_ARG_ENABLE(encap, AS_HELP_STRING(--enable-encap,encapsulate all files in a subdirectory at installation time), ENCAP=$enableval)
 AC_SUBST(XCODE,no)     AC_ARG_ENABLE(xcode, AS_HELP_STRING(--enable-xcode,create Macaulay2/d/interpret.a for use with xcode), XCODE=$enableval)
 
 AC_SUBST(CC_THREAD_SUPPORT)

M2/distributions/install/Makefile.in

@@ -1,41 +1,24 @@
 # @configure_input@
 # we want to ignore the --datarootdir setting, whatever that means, so here we we mention it: @datarootdir@
 include ../../include/config.Makefile
-ENCAP = @ENCAP@
 VPATH = @srcdir@
 ifneq (${prefix},${exec_prefix})
 $(error prefix and exec_prefix not the same)
 endif
 INFOFILES := $(notdir $(wildcard @pre_infodir@/*.info))
-#############################################################################
-# this changes @infodir@, etc:
-ifeq "${ENCAP}" "yes"
-prefix0 := $(DESTDIR)${prefix}/@package@
-exec_prefix0 := $(DESTDIR)${exec_prefix}/@package@
-else
-prefix0 := $(DESTDIR)${prefix}
-exec_prefix0 := $(DESTDIR)${exec_prefix}
-endif
-override prefix := ${prefix0}
-override exec_prefix := ${exec_prefix0}
-#############################################################################
 T=@TAR@ --create --file=- --mode=a+rX,og-ws --exclude-from=@srcdir@/../tar-exclusions
 install::
-	$(MKDIR_P) ${prefix}
-	$(T) -C @pre_prefix@      . | @TAR@ xfp - -C ${prefix}
-	$(T) -C @pre_exec_prefix@ . | @TAR@ xfp - -C ${exec_prefix}
-ifeq "${ENCAP}" "yes"
-	@INSTALL@ -m 755 ../top/postinstall ../top/preremove ${prefix}
-	@INSTALL@ -m 644 ../top/INSTALL     ../top/encapinfo ${prefix}
-endif
+	$(MKDIR_P) $(DESTDIR)@prefix@
+	$(T) -C @pre_prefix@      . | @TAR@ xfp - -C $(DESTDIR)@prefix@
+	$(T) -C @pre_exec_prefix@ . | @TAR@ xfp - -C $(DESTDIR)@exec_prefix@
 
-install::@infodir@/dir
-@infodir@/dir :; @INSTALL_DATA@ @abs_top_srcdir@/files/info-dir-template $@
+install::$(DESTDIR)@infodir@/dir
+$(DESTDIR)@infodir@/dir :; @INSTALL_DATA@ @abs_top_srcdir@/files/info-dir-template $@
 
 define ii
 install::
 	$(POST_INSTALL)
-	install-info --quiet --info-dir=@infodir@ @infodir@/$1
+	install-info --quiet --info-dir=$(DESTDIR)@infodir@ $(DESTDIR)@infodir@/$1
 	$(NORMAL_INSTALL)
 endef
 $(foreach i,$(INFOFILES),$(eval $(call ii,$i)))

M2/include/configuration.in

@@ -28,7 +28,6 @@ DMG=@DMG@
 ECHO_C=@ECHO_C@
 ECHO_N=@ECHO_N@
 ECHO_T=@ECHO_T@
-ENCAP=@ENCAP@
 ETAGS=@ETAGS@
 EXE=@EXE@
 EXEEXT=@EXEEXT@