From fef5939ab1ae1fe7079d6354bd7d118dbcee1f72 Mon Sep 17 00:00:00 2001
From: "John \"Elwin\" Edwards" <elwin@rlgallery.org>
Date: Mon, 26 Aug 2013 19:58:44 -0700
Subject: [PATCH] Don't set DESTDIR via configure.

DESTDIR ought to be set via option passed to 'make install'.
---
 rogue4/Makefile.in  |  2 +-
 rogue4/configure.ac | 20 --------------------
 rogue5/Makefile.in  |  2 +-
 rogue5/configure.ac | 20 --------------------
 4 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/rogue4/Makefile.in b/rogue4/Makefile.in
index 3f0986d..1387405 100644
--- a/rogue4/Makefile.in
+++ b/rogue4/Makefile.in
@@ -27,7 +27,7 @@ LOCKFILE=@LOCKFILE@
 #GROUPOWNER=games
 GROUPOWNER=@GROUPOWNER@
 
-DESTDIR=@DESTDIR@
+DESTDIR=
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
diff --git a/rogue4/configure.ac b/rogue4/configure.ac
index 6a964d7..b4b2818 100644
--- a/rogue4/configure.ac
+++ b/rogue4/configure.ac
@@ -151,26 +151,6 @@ fi
 
 AC_SUBST(SAVEDIR)
 
-AC_ARG_ENABLE([destdir],[AC_HELP_STRING([--enable-destdir=DESTDIR], [chroot to install into])],[],[])
-AC_MSG_CHECKING([for chrooted install])
-if test "x$enable_destdir" = "xno" ; then
-DESTDIR=
-elif test "x$enable_destdir" = "xyes" ; then
-DESTDIR=
-elif test "x$enable_destdir" = "x" ; then
-DESTDIR=
-else
-DESTDIR=$enable_destdir
-fi
-
-if test "x$DESTDIR" != "x" ; then
-AC_MSG_RESULT([$DESTDIR])
-else
-AC_MSG_RESULT([disabled])
-fi
-
-AC_SUBST(DESTDIR)
-
 AC_ARG_ENABLE([wizardmode],[AC_HELP_STRING([--enable-wizardmode], [enable availability of wizard mode @<:@default=no@:>@])],[],[])
 AC_MSG_CHECKING([if wizard mode is enabled])
 if test "x$enable_wizardmode" = "xno" ; then
diff --git a/rogue5/Makefile.in b/rogue5/Makefile.in
index df5ff09..8944d58 100644
--- a/rogue5/Makefile.in
+++ b/rogue5/Makefile.in
@@ -87,7 +87,7 @@ RMDIR=rmdir
 
 CHMOD=chmod
 
-DESTDIR=@DESTDIR@
+DESTDIR=
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
diff --git a/rogue5/configure.ac b/rogue5/configure.ac
index b50d370..b1a0048 100644
--- a/rogue5/configure.ac
+++ b/rogue5/configure.ac
@@ -151,26 +151,6 @@ fi
 
 AC_SUBST(SAVEDIR)
 
-AC_ARG_ENABLE([destdir],[AC_HELP_STRING([--enable-destdir=DESTDIR], [chroot to install into])],[],[])
-AC_MSG_CHECKING([for chrooted install])
-if test "x$enable_destdir" = "xno" ; then
-DESTDIR=
-elif test "x$enable_destdir" = "xyes" ; then
-DESTDIR=
-elif test "x$enable_destdir" = "x" ; then
-DESTDIR=
-else
-DESTDIR=$enable_destdir
-fi
-
-if test "x$DESTDIR" != "x" ; then
-AC_MSG_RESULT([$DESTDIR])
-else
-AC_MSG_RESULT([disabled])
-fi
-
-AC_SUBST(DESTDIR)
-
 AC_ARG_ENABLE([wizardmode],[AC_HELP_STRING([--enable-wizardmode], [enable availability of wizard mode @<:@default=no@:>@])],[],[])
 AC_MSG_CHECKING([if wizard mode is enabled])
 if test "x$enable_wizardmode" = "xno" ; then