Attachment #17019 for bug #27844

View | Details | Raw Unified | Return to bug 27844
Collapse All | Expand All

Lines 327-332 Link Here

(-)gproftpd-8.0.8-vanilla/configure (-2 / +9 lines)
327	libexecdir='${exec_prefix}/libexec'	327	libexecdir='${exec_prefix}/libexec'
328	datadir='${prefix}/share'	328	datadir='${prefix}/share'
329	sysconfdir='${prefix}/etc'	329	sysconfdir='${prefix}/etc'
		330	proftpdconfdir='${sysconfdir}'
330	sharedstatedir='${prefix}/com'	331	sharedstatedir='${prefix}/com'
331	localstatedir='${prefix}/var'	332	localstatedir='${prefix}/var'
332	libdir='${exec_prefix}/lib'	333	libdir='${exec_prefix}/lib'
Lines 557-562 Link Here
557	\| --syscon=* \| --sysco=* \| --sysc=* \| --sys=* \| --sy=*)	558	\| --syscon=* \| --sysco=* \| --sysc=* \| --sys=* \| --sy=*)
558	sysconfdir=$ac_optarg ;;	559	sysconfdir=$ac_optarg ;;
559		560
		561	-proftpdconfdir=* \| --proftpdconfdir=* \| --proftpdconfdi=* \| --proftpdconfd=* \
		562	\| --proftpdconf=* \| --proftpdcon=* \| --proftpdco=* \| --proftpdc=* \| --proftpd=* \
		563	\| --proftp=* \| --proft=* \| --prof=*)
		564	proftpdconfdir=$ac_optarg ;;
		565
560	-target \| --target \| --targe \| --targ \| --tar \| --ta \| --t)	566	-target \| --target \| --targe \| --targ \| --tar \| --ta \| --t)
561	ac_prev=target_alias ;;	567	ac_prev=target_alias ;;
562	-target=* \| --target=* \| --targe=* \| --targ=* \| --tar=* \| --ta=* \| --t=*)	568	-target=* \| --target=* \| --targe=* \| --targ=* \| --tar=* \| --ta=* \| --t=*)
Lines 652-658 Link Here
652	done	658	done
653		659
654	# Be sure to have absolute paths.	660	# Be sure to have absolute paths.
655	for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \	661	for ac_var in bindir sbindir libexecdir datadir sysconfdir proftpdconfdir sharedstatedir \
656	localstatedir libdir includedir oldincludedir infodir mandir	662	localstatedir libdir includedir oldincludedir infodir mandir
657	do	663	do
658	eval ac_val=$`echo $ac_var`	664	eval ac_val=$`echo $ac_var`
Lines 802-807 Link Here
802	--libexecdir=DIR program executables [EPREFIX/libexec]	808	--libexecdir=DIR program executables [EPREFIX/libexec]
803	--datadir=DIR read-only architecture-independent data [PREFIX/share]	809	--datadir=DIR read-only architecture-independent data [PREFIX/share]
804	--sysconfdir=DIR read-only single-machine data [PREFIX/etc]	810	--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
		811	--proftpdconfdir=DIR proftpd.conf location [SYSCONFDIR]
805	--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]	812	--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
806	--localstatedir=DIR modifiable single-machine data [PREFIX/var]	813	--localstatedir=DIR modifiable single-machine data [PREFIX/var]
807	--libdir=DIR object code libraries [EPREFIX/lib]	814	--libdir=DIR object code libraries [EPREFIX/lib]
Lines 6210-6216 Link Here
6210		6217
6211		6218
6212	cat >>confdefs.h <<_ACEOF	6219	cat >>confdefs.h <<_ACEOF
6213	#define GP_CONF "`eval echo "${sysconfdir}/proftpd.conf"`"	6220	#define GP_CONF "`eval echo "${proftpdconfdir}/proftpd.conf"`"
6214	_ACEOF	6221	_ACEOF
6215		6222
6216		6223

Lines 117-123 Link Here

(-)gproftpd-8.0.8-vanilla/configure.in (-1 / +1 lines)
117	test "x$prefix" = xNONE && prefix=$ac_default_prefix	117	test "x$prefix" = xNONE && prefix=$ac_default_prefix
118	test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'	118	test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
119		119
120	AC_DEFINE_UNQUOTED(GP_CONF,"`eval echo "${sysconfdir}/proftpd.conf"`",[path to proftpd.conf])	120	AC_DEFINE_UNQUOTED(GP_CONF,"`eval echo "${proftpdconfdir}/proftpd.conf"`",[path to proftpd.conf])
121	AC_DEFINE_UNQUOTED(GP_FTPUSERS,"`eval echo "${sysconfdir}/ftpusers"`",[path to ftpusers])	121	AC_DEFINE_UNQUOTED(GP_FTPUSERS,"`eval echo "${sysconfdir}/ftpusers"`",[path to ftpusers])
122	AC_DEFINE_UNQUOTED(GP_SHELLS,"`eval echo "${sysconfdir}/shells"`",[path to shells])	122	AC_DEFINE_UNQUOTED(GP_SHELLS,"`eval echo "${sysconfdir}/shells"`",[path to shells])
123	AC_DEFINE_UNQUOTED(GP_SHUTMSG,"`eval echo "${sysconfdir}/shutmsg"`",[path to shutmsg])	123	AC_DEFINE_UNQUOTED(GP_SHUTMSG,"`eval echo "${sysconfdir}/shutmsg"`",[path to shutmsg])

Return to bug 27844