Fix handling of sysconfdir

git-svn-id: http://svn.fedorahosted.org/svn/corosync/trunk@2265 fd59a12c-fef9-0310-b244-a6a79926bd2f

Makefile.am

@@ -39,20 +39,22 @@ MAINTAINERCLEANFILES    = Makefile.in aclocal.m4 configure depcomp \
 dist_doc_DATA		= LICENSE INSTALL README.devmap \
 			  README.recovery SECURITY TODO AUTHORS
 
-sysconf_DATA		= conf/corosync.conf.example
+corosysconfdir		= ${COROSYSCONFDIR}
+
+corosysconf_DATA	= conf/corosync.conf.example
 
 SUBDIRS	= include lcr lib exec services tools test pkgconfig man
 # init
 
 install-exec-local:
-	$(INSTALL) -d $(DESTDIR)/${sysconfdir}/uidgid.d
+	$(INSTALL) -d $(DESTDIR)/${COROSYSCONFDIR}/uidgid.d
 	$(INSTALL) -d $(DESTDIR)/${localstatedir}/lib/corosync
-	$(INSTALL) -d $(DESTDIR)/$(SOCKETDIR)
+	$(INSTALL) -d $(DESTDIR)/${SOCKETDIR}
 
 uninstall-local:
-	rmdir $(DESTDIR)/${sysconfdir}/uidgid.d || :;
+	rmdir $(DESTDIR)/${COROSYSCONFDIR}/uidgid.d || :;
 	rmdir $(DESTDIR)/${localstatedir}/lib/corosync || :;
-	rmdir $(DESTDIR)/$(SOCKETDIR) || :;
+	rmdir $(DESTDIR)/${SOCKETDIR} || :;
 
 lint:
 	for dir in lcr lib exec services tools test; do make -C $$dir lint; done

configure.ac

@@ -24,7 +24,7 @@ if test "$prefix" = "NONE"; then
 	fi
 	dnl Fix "sysconfdir" variable if not specified
 	if test "$sysconfdir" = "\${prefix}/etc"; then
-		sysconfdir="/etc/corosync"
+		sysconfdir="/etc"
 	fi
 	dnl Fix "libdir" variable if not specified
 	if test "$libdir" = "\${exec_prefix}/lib"; then
@@ -378,7 +378,10 @@ AC_SUBST([LINT_FLAGS])
 AC_DEFINE_UNQUOTED([LCRSODIR], "$(eval echo ${LCRSODIR})", [LCRSO directory])
 AC_DEFINE_UNQUOTED([SOCKETDIR], "$(eval echo ${SOCKETDIR})", [Socket directory])
 AC_DEFINE_UNQUOTED([LOCALSTATEDIR], "$(eval echo ${localstatedir})", [localstate directory])
-AC_DEFINE_UNQUOTED([SYSCONFDIR], "$(eval echo ${sysconfdir})", [sysconfig directory])
+
+COROSYSCONFDIR=${sysconfdir}/corosync
+AC_SUBST([COROSYSCONFDIR])
+AC_DEFINE_UNQUOTED([COROSYSCONFDIR], "$(eval echo ${COROSYSCONFDIR})", [corosync config directory])
 
 AC_OUTPUT
 
@@ -394,6 +397,7 @@ AC_MSG_RESULT([  Header files             = ${includedir}])
 AC_MSG_RESULT([  Arch-independent files   = ${datadir}])
 AC_MSG_RESULT([  State information        = ${localstatedir}])
 AC_MSG_RESULT([  System configuration     = ${sysconfdir}])
+AC_MSG_RESULT([  corosync config dir      = ${COROSYSCONFDIR}])
 AC_MSG_RESULT([  LCRSO                    = ${LCRSODIR}])
 AC_MSG_RESULT([  SOCKETDIR                = ${SOCKETDIR}])
 AC_MSG_RESULT([  Features                 =${PACKAGE_FEATURES}])

exec/coroparse.c

@@ -219,7 +219,7 @@ static int read_uidgid_files_into_objdb(
 	int res = 0;
 	struct stat stat_buf;
 
-	dirname = SYSCONFDIR "/uidgid.d";
+	dirname = COROSYSCONFDIR "/uidgid.d";
 	dp = opendir (dirname);
 
 	if (dp == NULL)
@@ -261,7 +261,7 @@ static int read_config_file_into_objdb(
 
 	filename = getenv ("COROSYNC_MAIN_CONFIG_FILE");
 	if (!filename)
-		filename = SYSCONFDIR "/corosync.conf";
+		filename = COROSYSCONFDIR "/corosync.conf";
 
 	fp = fopen (filename, "r");
 	if (fp == NULL) {

exec/totemconfig.c

@@ -764,7 +764,7 @@ int totem_config_keyread (
 	if (!got_key) {
 		const char *filename = getenv("COROSYNC_TOTEM_AUTHKEY_FILE");
 		if (!filename)
-			filename = SYSCONFDIR "/authkey";
+			filename = COROSYSCONFDIR "/authkey";
 		res = read_keyfile(filename, totem_config, error_string);
 		if (res)
 			goto key_error;

tools/corosync-keygen.c

@@ -44,7 +44,7 @@
 
 #include <netinet/in.h>
 
-#define KEYFILE SYSCONFDIR "/authkey"
+#define KEYFILE COROSYSCONFDIR "/authkey"
 
 int main (void) {
 	int authkey_fd;
@@ -57,9 +57,9 @@ int main (void) {
 		printf ("Error: Authorization key must be generated as root user.\n");
 		exit (1);
 	}
-	if (mkdir (SYSCONFDIR, 0700)) {
+	if (mkdir (COROSYSCONFDIR, 0700)) {
 		if (errno != EEXIST) {
-			perror ("Failed to create directory: " SYSCONFDIR "/ais");
+			perror ("Failed to create directory: " COROSYSCONFDIR);
 			exit (1);
 		}
 	}