Mercurial > hg > early-roguelike

changeset 93:8f7c082fde46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't set DESTDIR via configure. DESTDIR ought to be set via option passed to 'make install'.
author John "Elwin" Edwards
date Mon, 26 Aug 2013 19:58:44 -0700
parents 53e69c17c313
children ba9930a7f99d
files rogue4/Makefile.in rogue4/configure.ac rogue5/Makefile.in rogue5/configure.ac
diffstat 4 files changed, 2 insertions(+), 42 deletions(-) [+]
line wrap: on
line diff
--- a/rogue4/Makefile.in	Sun Aug 25 21:31:22 2013 -0700
+++ b/rogue4/Makefile.in	Mon Aug 26 19:58:44 2013 -0700
@@ -27,7 +27,7 @@
 #GROUPOWNER=games
 GROUPOWNER=@GROUPOWNER@
 
-DESTDIR=@DESTDIR@
+DESTDIR=
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 datarootdir=@datarootdir@
--- a/rogue4/configure.ac	Sun Aug 25 21:31:22 2013 -0700
+++ b/rogue4/configure.ac	Mon Aug 26 19:58:44 2013 -0700
@@ -151,26 +151,6 @@
 
 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
--- a/rogue5/Makefile.in	Sun Aug 25 21:31:22 2013 -0700
+++ b/rogue5/Makefile.in	Mon Aug 26 19:58:44 2013 -0700
@@ -87,7 +87,7 @@
 
 CHMOD=chmod
 
-DESTDIR=@DESTDIR@
+DESTDIR=
 
 prefix=@prefix@
 exec_prefix=@exec_prefix@
--- a/rogue5/configure.ac	Sun Aug 25 21:31:22 2013 -0700
+++ b/rogue5/configure.ac	Mon Aug 26 19:58:44 2013 -0700
@@ -151,26 +151,6 @@
 
 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