The last patch I sent was missing a fix for libggi/libggi.conf.in
On 03 Jul 2001 13:45:21 -0600, Thayne Harbaugh wrote:
> This is similar to the gii_confdir.patch that I sent before. It allows
> ggi config files to track any changes to sysconfdir that might happen
> during a build and install.
>
> --
> Thayne Harbaugh
>
> Your eyes are weary from staring at the CRT. You feel sleepy. Notice how
> restful it is to watch the cursor blink. Close your eyes. The opinions
> stated above are yours. You cannot imagine why you ever felt otherwise.
--
Thayne Harbaugh
Your eyes are weary from staring at the CRT. You feel sleepy. Notice how
restful it is to watch the cursor blink. Close your eyes. The opinions
stated above are yours. You cannot imagine why you ever felt otherwise.
diff -uNr libggi-cvs.orig/Makefile.am libggi-cvs/Makefile.am
--- libggi-cvs.orig/Makefile.am Sat May 12 17:01:20 2001
+++ libggi-cvs/Makefile.am Tue Jul 3 12:57:31 2001
@@ -3,7 +3,7 @@
SUBDIRS = include ggi display default extensions programs doc m4
-ggiconfdatadir = @ggi_confdir@
+ggiconfdatadir = $(sysconfdir)/@ggi_confdir@
ggiconfdata_DATA = libggi.conf
noinst_PROGRAMS = patchlib
diff -uNr libggi-cvs.orig/configure.in libggi-cvs/configure.in
--- libggi-cvs.orig/configure.in Tue Jun 26 12:05:56 2001
+++ libggi-cvs/configure.in Tue Jul 3 12:55:28 2001
@@ -774,16 +774,13 @@
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-eval foo="$libdir"
-eval ggi_libdir="$foo"
-eval ggi_confdir="$sysconfdir/ggi"
+eval ggi_confdir="ggi"
-AC_SUBST(ggi_libdir)
AC_SUBST(ggi_confdir)
AC_DEFINE_UNQUOTED(GGITAGLEN,$TAGLEN)
AC_DEFINE_UNQUOTED(GGIPATHTAG,"$PATHTAG")
AC_DEFINE_UNQUOTED(GGICONFFILE,"$ggi_conffile")
-AC_DEFINE_UNQUOTED(GGICONFDIR,"$PATHTAG$ggi_confdir")
+AC_DEFINE_UNQUOTED(GGICONFDIR,"$PATHTAG$sysconfdir/$ggi_confdir")
if test "x$use_threads" = "xpthread"; then
AC_DEFINE(USE_THREADS)
diff -uNr libggi-cvs.orig/display/fbdev/Makefile.am libggi-cvs/display/fbdev/Makefile.am
--- libggi-cvs.orig/display/fbdev/Makefile.am Sat May 12 17:02:03 2001
+++ libggi-cvs/display/fbdev/Makefile.am Tue Jul 3 12:57:31 2001
@@ -9,7 +9,7 @@
sublibdir = $(libdir)/ggi/display
-fbdevconfdir = @ggi_confdir@/targets
+fbdevconfdir = $(sysconfdir)/@ggi_confdir@/targets
fbdevconf_DATA = fbdev.conf
EXTRA_DIST = EXPSYMS
--- libggi-cvs.orig/libggi.conf.in Mon Jun 11 12:43:58 2001
+++ libggi-cvs/libggi.conf.in Tue Jul 3 13:49:39 2001
@@ -1,5 +1,5 @@
# Mapping file for suggest-strings to libraries
-.root: @ggi_libdir@/ggi
+.root: @libdir@/ggi
#
# suggest_name library_name versions
# ------------ -------------------------- --------
