Attachment #636254 for bug #721110

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

Lines 219-224 Link Here

(-)drbd-utils-9.12.2-old/configure.ac (+11 lines)
219	[WITH_DRBDMON=$withval])	219	[WITH_DRBDMON=$withval])
220	AC_SUBST(WITH_DRBDMON)	220	AC_SUBST(WITH_DRBDMON)
221		221
		222
		223	AC_ARG_WITH(helperlibdir,
		224	AS_HELP_STRING([--with-helperlibdir=DIR],
		225	[install helper lib binaries in DIR [[/lib/drbd]]]),
		226	helperlibdir=$withval, helperlibdir='/lib/drbd')
		227	AC_SUBST(helperlibdir)
		228
222	dnl Checks for programs	229	dnl Checks for programs
223	AC_PROG_CC	230	AC_PROG_CC
224	AC_PROG_LN_S	231	AC_PROG_LN_S
Lines 440-445 Link Here
440	AC_SUBST(RPM_REQ_CHKCONFIG_PREUN)	447	AC_SUBST(RPM_REQ_CHKCONFIG_PREUN)
441	AC_SUBST(WITH_CLITEST)	448	AC_SUBST(WITH_CLITEST)
442		449
		450	AH_TEMPLATE(DRBD_HELPER_LIB_DIR, [Helper tool directory. Commonly
		451	/lib/drbd or /usr/local/lib/drbd])
443	AH_TEMPLATE(DRBD_LIB_DIR, [Local state directory. Commonly	452	AH_TEMPLATE(DRBD_LIB_DIR, [Local state directory. Commonly
444	/var/lib/drbd or /usr/local/var/lib/drbd])	453	/var/lib/drbd or /usr/local/var/lib/drbd])
445	AH_TEMPLATE(DRBD_RUN_DIR, [Runtime state directory. Commonly	454	AH_TEMPLATE(DRBD_RUN_DIR, [Runtime state directory. Commonly
Lines 456-467 Link Here
456	AH_TEMPLATE(DRBD_LEGACY_84, [Include support for drbd-8.4 kernel code])	465	AH_TEMPLATE(DRBD_LEGACY_84, [Include support for drbd-8.4 kernel code])
457	AH_TEMPLATE(WINDRBD, [Include support for windrbd (do not use this under Linux)])	466	AH_TEMPLATE(WINDRBD, [Include support for windrbd (do not use this under Linux)])
458		467
		468	AC_SUBST(DRBD_HELPER_LIB_DIR, [$helperlibdir])
459	AC_SUBST(DRBD_LIB_DIR, [$localstatedir/lib/$PACKAGE_TARNAME])	469	AC_SUBST(DRBD_LIB_DIR, [$localstatedir/lib/$PACKAGE_TARNAME])
460	AC_SUBST(DRBD_RUN_DIR, [$localstatedir/run/$PACKAGE_TARNAME])	470	AC_SUBST(DRBD_RUN_DIR, [$localstatedir/run/$PACKAGE_TARNAME])
461	AC_SUBST(DRBD_LOCK_DIR, [$localstatedir/lock])	471	AC_SUBST(DRBD_LOCK_DIR, [$localstatedir/lock])
462	AC_SUBST(DRBD_CONFIG_DIR, [$sysconfdir])	472	AC_SUBST(DRBD_CONFIG_DIR, [$sysconfdir])
463	AC_SUBST(DRBD_BIN_DIR, [$exec_prefix/bin])	473	AC_SUBST(DRBD_BIN_DIR, [$exec_prefix/bin])
464		474
		475	AC_DEFINE_UNQUOTED(DRBD_HELPER_LIB_DIR, ["$DRBD_HELPER_LIB_DIR"])
465	AC_DEFINE_UNQUOTED(DRBD_LIB_DIR, ["$DRBD_LIB_DIR"])	476	AC_DEFINE_UNQUOTED(DRBD_LIB_DIR, ["$DRBD_LIB_DIR"])
466	AC_DEFINE_UNQUOTED(DRBD_RUN_DIR, ["$DRBD_RUN_DIR"])	477	AC_DEFINE_UNQUOTED(DRBD_RUN_DIR, ["$DRBD_RUN_DIR"])
467	AC_DEFINE_UNQUOTED(DRBD_LOCK_DIR, ["$DRBD_LOCK_DIR"])	478	AC_DEFINE_UNQUOTED(DRBD_LOCK_DIR, ["$DRBD_LOCK_DIR"])

Lines 12-17 Link Here

(-)drbd-utils-9.12.2-old/user/shared/config.h.in (+3 lines)
12	/* Include support for drbd-8.4 kernel code */	12	/* Include support for drbd-8.4 kernel code */
13	#undef DRBD_LEGACY_84	13	#undef DRBD_LEGACY_84
14		14
		15	/* Helper library binaries directory. Commonly /lib/drbd or /usr/local/lib/drbd */
		16	#undef DRBD_HELPER_LIB_DIR
		17
15	/* Local state directory. Commonly /var/lib/drbd or /usr/local/var/lib/drbd */	18	/* Local state directory. Commonly /var/lib/drbd or /usr/local/var/lib/drbd */
16	#undef DRBD_LIB_DIR	19	#undef DRBD_LIB_DIR
17		20

Lines 285-291 Link Here

(-)drbd-utils-9.12.2-old/user/v84/drbdadm_usage_cnt.c (-1 / +1 lines)
285	m_asprintf(&new_path, "%s%s%s",	285	m_asprintf(&new_path, "%s%s%s",
286	old_path,	286	old_path,
287	old_path ? ":" : "",	287	old_path ? ":" : "",
288	"/lib/drbd");	288	DRBD_HELPER_LIB_DIR);
289	setenv("PATH", new_path, 1);	289	setenv("PATH", new_path, 1);
290	}	290	}
291		291

Lines 333-339 Link Here

(-)drbd-utils-9.12.2-old/user/v9/drbdtool_common.c (-1 / +1 lines)
333	void add_lib_drbd_to_path(void)	333	void add_lib_drbd_to_path(void)
334	{	334	{
335	/* TODO: if exec-prefix != "/" ? */	335	/* TODO: if exec-prefix != "/" ? */
336	add_component_to_path("/lib/drbd");	336	add_component_to_path(DRBD_HELPER_LIB_DIR);
337	}	337	}
338		338
339	/* from linux/crypto/crc32.c */	339	/* from linux/crypto/crc32.c */

Return to bug 721110