Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnopernicus/ChangeLog,v
retrieving revision 1.785
diff -u -r1.785 ChangeLog
--- ChangeLog	11 Oct 2005 07:08:42 -0000	1.785
+++ ChangeLog	15 Oct 2005 10:11:34 -0000
@@ -1,3 +1,15 @@
+2005-10-15 Julio M. Merino Vidal <jmmv@NetBSD.org>
+
+	* configure.ac:
+	* brlmon/Makefile.am:
+	* gnopi/Makefile.am:
+	* srcore/Makefile.am:
+	* braille/libbrl/Makefile.am:
+	Centralize the set up of the configuration directory in the configure
+	script by adding a --with-sysconfsubdir argument that lets the user
+	tune the 'gnopernicus-1.0' subdirectory name.  Change the Makefile.am
+	files to use the new $(gnopernicusconfdir) variable.
+
 2005-10-11 Remus Draica <rd@baum.ro>
 	
 	* configure.in:
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gnopernicus/configure.in,v
retrieving revision 1.179
diff -u -r1.179 configure.in
--- configure.in	11 Oct 2005 07:08:42 -0000	1.179
+++ configure.in	15 Oct 2005 10:11:34 -0000
@@ -75,6 +75,19 @@
 AC_PROG_INTLTOOL([0.29])
 
 dnl ***************************************************************************
+dnl *		     Configuration directory related settings		      *
+dnl ***************************************************************************
+AC_ARG_WITH(sysconfsubdir, AC_HELP_STRING([--with-sysconfsubdir],
+            [directory name used under sysconfdir, default=gnopernicus-1.0]),
+            sysconfsubdir=${withval}, sysconfsubdir=gnopernicus-1.0)
+if test x"${sysconfsubdir}" != x; then
+    gnopernicusconfdir="${sysconfdir}/${sysconfsubdir}"
+else
+    gnopernicusconfdir="${sysconfdir}"
+fi
+AC_SUBST(gnopernicusconfdir)
+
+dnl ***************************************************************************
 dnl *				GConf related settings			      *
 dnl ***************************************************************************
 AM_GCONF_SOURCE_2
Index: braille/libbrl/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnopernicus/braille/libbrl/Makefile.am,v
retrieving revision 1.20
diff -u -r1.20 Makefile.am
--- braille/libbrl/Makefile.am	22 Aug 2005 09:42:12 -0000	1.20
+++ braille/libbrl/Makefile.am	15 Oct 2005 10:11:34 -0000
@@ -5,7 +5,7 @@
 INCLUDES = -I$(top_builddir)			\
 	   -I$(top_srcdir)/srutil		\
 	   -I$(top_srcdir)/srconf/libsrconf 	\
-	   -DBRAILLE_TRANS_TABLES_DIR=\"$(sysconfdir)/gnopernicus-1.0/translation_tables/\" \
+	   -DBRAILLE_TRANS_TABLES_DIR=\"$(gnopernicusconfdir)/translation_tables/\" \
 	   $(BRLTTY_ACTIVE)			\
 	   $(LIBBRL_CFLAGS) 			\
 	   $(BRLTTY_INCLUDE)			\
Index: brlmon/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnopernicus/brlmon/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- brlmon/Makefile.am	12 Aug 2004 08:11:21 -0000	1.16
+++ brlmon/Makefile.am	15 Oct 2005 10:11:34 -0000
@@ -34,7 +34,7 @@
 #brlmon_gladedir = $(datadir)/gnopernicus/glade/brlmon_files
 #brlmon_glade_DATA = monitor.glade2
 
-#brlmon_fontdir = $(sysconfdir)/gnopernicus-1.0/braille_fonts
+#brlmon_fontdir = $(gnopernicusconfdir)/braille_fonts
 #brlmon_font_DATA = braille14.bdf
 
 EXTRA_DIST = brl.xml		
Index: gnopi/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnopernicus/gnopi/Makefile.am,v
retrieving revision 1.39
diff -u -r1.39 Makefile.am
--- gnopi/Makefile.am	11 Oct 2005 06:56:45 -0000	1.39
+++ gnopi/Makefile.am	15 Oct 2005 10:11:34 -0000
@@ -72,7 +72,7 @@
 	../srconf/libsrconf/libsrconf.la\
 	$(GNOPI_LIBS)
 
-translationdir = $(sysconfdir)/gnopernicus-1.0/translation_tables
+translationdir = $(gnopernicusconfdir)/translation_tables
 translation_DATA = de.a2b	\
 	           es.a2b	\
 	           sv.a2b	\
Index: srcore/Makefile.am
===================================================================
RCS file: /cvs/gnome/gnopernicus/srcore/Makefile.am,v
retrieving revision 1.30
diff -u -r1.30 Makefile.am
--- srcore/Makefile.am	22 Aug 2005 09:42:14 -0000	1.30
+++ srcore/Makefile.am	15 Oct 2005 10:11:35 -0000
@@ -8,7 +8,7 @@
 	   -I$(top_srcdir)/magnifier/libmag   	\
 	   -I$(top_srcdir)/srutil             	\
 	   -DGNOPERNICUSLOCALEDIR=\""$(gnopernicuslocaledir)"\" \
-	   -DBRAILLE_TRANS_TABLES_DIR=\"$(sysconfdir)/gnopernicus-1.0/translation_tables/\" \
+	   -DBRAILLE_TRANS_TABLES_DIR=\"$(gnopernicusconfdir)/translation_tables/\" \
 	   -DPRESENTATION_DIR=\"$(datadir)/gnopernicus/presentation/\" \
 	   -DBRLMON_DIR=\"$(libexecdir)/\" \
 	   $(SRCORE_CFLAGS)  			\
