warden/early-roguelike
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't set DESTDIR via configure.

Browse source 
DESTDIR ought to be set via option passed to 'make install'.
This commit is contained in:
John "Elwin" Edwards 2013-08-26 19:58:44 -07:00
parent 4e5449535a
commit fef5939ab1
4 changed files with 2 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rogue4/Makefile.in
View file

@ -27,7 +27,7 @@ LOCKFILE=@LOCKFILE@
#GROUPOWNER=games #GROUPOWNER=games
GROUPOWNER=@GROUPOWNER@ GROUPOWNER=@GROUPOWNER@
DESTDIR=@DESTDIR@ DESTDIR=
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@
datarootdir=@datarootdir@ datarootdir=@datarootdir@

20
rogue4/configure.ac
View file

@ -151,26 +151,6 @@ fi
AC_SUBST(SAVEDIR) 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_ARG_ENABLE([wizardmode],[AC_HELP_STRING([--enable-wizardmode], [enable availability of wizard mode @<:@default=no@:>@])],[],[])
AC_MSG_CHECKING([if wizard mode is enabled]) AC_MSG_CHECKING([if wizard mode is enabled])
if test "x$enable_wizardmode" = "xno" ; then if test "x$enable_wizardmode" = "xno" ; then

2
rogue5/Makefile.in
View file

@ -87,7 +87,7 @@ RMDIR=rmdir
CHMOD=chmod CHMOD=chmod
DESTDIR=@DESTDIR@ DESTDIR=
prefix=@prefix@ prefix=@prefix@
exec_prefix=@exec_prefix@ exec_prefix=@exec_prefix@

20
rogue5/configure.ac
View file

@ -151,26 +151,6 @@ fi
AC_SUBST(SAVEDIR) 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_ARG_ENABLE([wizardmode],[AC_HELP_STRING([--enable-wizardmode], [enable availability of wizard mode @<:@default=no@:>@])],[],[])
AC_MSG_CHECKING([if wizard mode is enabled]) AC_MSG_CHECKING([if wizard mode is enabled])
if test "x$enable_wizardmode" = "xno" ; then if test "x$enable_wizardmode" = "xno" ; then