Corrected configure.in to correctly use withval for setting the
with-distdir option.
This commit is contained in:
parent
b5ab38d5d7
commit
7f4b5817e2
|
|
@ -633,7 +633,7 @@ gr_srcs
|
|||
gr_libs
|
||||
gr_dflags
|
||||
gr_cflags
|
||||
dist_prefix
|
||||
DIST_DIR
|
||||
cadinstall
|
||||
programs
|
||||
unused
|
||||
|
|
@ -4805,15 +4805,15 @@ usingX11=
|
|||
# place that is a temporary staging area, like DESTDIR, but unlike DESTDIR,
|
||||
# the prefix is replaced by the destination directory, rather than appended
|
||||
# to it.
|
||||
dist_prefix="\${exec_prefix}"
|
||||
DIST_DIR="\${exec_prefix}"
|
||||
|
||||
# Check whether --with-distdir was given.
|
||||
if test "${with_distdir+set}" = set; then :
|
||||
withval=$with_distdir;
|
||||
if test "$withval" = "no" -o "$withval" = "NO" ; then
|
||||
dist_prefix="\${exec_prefix}"
|
||||
DIST_DIR="\${exec_prefix}"
|
||||
else
|
||||
dist_prefix=$arg
|
||||
DIST_DIR=${withval}
|
||||
fi
|
||||
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -253,13 +253,13 @@ dnl Compile-time options below. . .
|
|||
# place that is a temporary staging area, like DESTDIR, but unlike DESTDIR,
|
||||
# the prefix is replaced by the destination directory, rather than appended
|
||||
# to it.
|
||||
dist_prefix="\${exec_prefix}"
|
||||
DIST_DIR="\${exec_prefix}"
|
||||
AC_ARG_WITH(distdir,
|
||||
[ --with-distdir=DIR install into location DIR for distribution], [
|
||||
if test "$withval" = "no" -o "$withval" = "NO" ; then
|
||||
dist_prefix="\${exec_prefix}"
|
||||
DIST_DIR="\${exec_prefix}"
|
||||
else
|
||||
dist_prefix=$arg
|
||||
DIST_DIR=${withval}
|
||||
fi
|
||||
], )
|
||||
|
||||
|
|
@ -1286,7 +1286,7 @@ AC_SUBST(modules)
|
|||
AC_SUBST(unused)
|
||||
AC_SUBST(programs)
|
||||
AC_SUBST(cadinstall)
|
||||
AC_SUBST(dist_prefix)
|
||||
AC_SUBST(DIST_DIR)
|
||||
|
||||
AC_SUBST(gr_cflags)
|
||||
AC_SUBST(gr_dflags)
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -35,9 +35,9 @@ DOCDIR = ${libdir}/netgen/doc
|
|||
TCLDIR = ${libdir}/netgen/tcl
|
||||
PYDIR = ${libdir}/netgen/python
|
||||
|
||||
INSTALL_BINDIR = @dist_prefix@/bin
|
||||
INSTALL_MANDIR = @dist_prefix@/share/man
|
||||
INSTALL_LIBDIR = @dist_prefix@/lib
|
||||
INSTALL_BINDIR = @DIST_DIR@/bin
|
||||
INSTALL_MANDIR = @DIST_DIR@/share/man
|
||||
INSTALL_LIBDIR = @DIST_DIR@/lib
|
||||
INSTALL_DOCDIR = ${INSTALL_LIBDIR}/netgen/doc
|
||||
INSTALL_TCLDIR = ${INSTALL_LIBDIR}/netgen/tcl
|
||||
INSTALL_PYDIR = ${INSTALL_LIBDIR}/netgen/python
|
||||
|
|
|
|||
Loading…
Reference in New Issue