Commit 6dcafe6c authored by Bernhard Link's avatar Bernhard Link

don't install gv_spartan.dat and gv_widgetless.dat with fallback styles

* Markus Steinborn <gnugv_maintainer@yahoo.de> [110506 13:28]:
> Hello Bernhard,
>
> I've applied the other three patches.
>
> Bernhard R. Link schrieb:
>> With fallback styles enabled (currently default), gv_spartan.dat and
>> gv_widgetless.dat are always replaced with compiled in versions,
>> so do not install those files to not confuse users with installing
>> files that have no effect if changed.
>> ---
>>
> On my system, GNU gv 3.7.2 installs the following files within
> /usr/share/gv/
>
> /usr/share/gv/GV

that is stored in appdefaultsdir (which by default might be the same,
but can thus be installed in a way that it is used.

> /usr/share/gv/gv_class.ad
> /usr/share/gv/gv_copyright.dat
> /usr/share/gv/gv_spartan.dat
> /usr/share/gv/gv_system.ad
> /usr/share/gv/gv_user.ad
> /usr/share/gv/gv_user_res.dat
> /usr/share/gv/gv_widgetless.dat
>
> Except "/usr/share/gv/gv_system.ad" none is read iff fallback styles are
> enabled. I do not see any reason to handle gv_spartan.dat and
> gv_widgetless.dat different from the raiming gv_*-files (except
> gv_system.ad).

I did not realize that. I only saw that those two are used with fallback
styles and not without. What about the following then?

>From 6540ff7072006cc84768704c1e0ceef80544be13 Mon Sep 17 00:00:00 2001
From: Bernhard R. Link <brlink@debian.org>
Date: Thu, 28 Apr 2011 16:24:16 +0200
Subject: [PATCH] don't install .ad files not used

Only install files gv actually reads. Having other files around
is confusing as changing them has no effect.

With fallback styles enabled (currently default), gv_spartan.dat and
gv_widgetless.dat are always replaced with compiled in versions,
so only install them if fallback styles are disabled.
parent 6860bdce
......@@ -206,6 +206,7 @@ dnl USE_FALLBACK_STYLES=-DUSE_FALLBACK_STYLES
AC_DEFINE(USE_FALLBACK_STYLES,[],[Define USE_FALLBACK_STYLES])
}
AM_CONDITIONAL(ENABLE_FALLBACK_STYLES, test x$opt_fallback_styles = xyes)
AC_ARG_ENABLE(memmove-code, AC_HELP_STRING([--enable-memmove-code],[Use gv's own memmove. It defaults to `yes']), opt_memmove_code=$enableval, opt_memmove_code=yes)
......
......@@ -7,8 +7,10 @@
# File distribution
bin_PROGRAMS = gv
bin_SCRIPTS = gv-update-userconfig
dist_pkgdata_DATA = gv_spartan.dat gv_user_res.dat gv_copyright.dat gv_widgetless.dat
pkgdata_DATA = gv_system.ad gv_user.ad gv_class.ad
pkgdata_DATA = gv_system.ad
if !ENABLE_FALLBACK_STYLES
pkgdata_DATA += gv_spartan.dat gv_widgetless.dat
endif
appdefaultsdir = $(pkgdatadir)
......@@ -16,7 +18,8 @@ appdefaults_DATA = ../GV
EXTRA_DIST=ad2c gv_font_res.dat gv_font_res-I18N_mb.dat gv_layout_res.dat gv-i18n.pl gv_misc_res.dat Aaa_bison.yacc \
gv_current.xbm gv_doc.xbm gv_empty.xbm gv_even.xbm gv_icon.xbm gv_odd.xbm \
gv_selected.xbm gv_unmark.xbm $(srcdir)/nls/*
gv_selected.xbm gv_unmark.xbm $(srcdir)/nls/* \
gv_spartan.dat gv_widgetless.dat gv_user_res.dat gv_copyright.dat
# Clean files
CLEANFILES = ../GV \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment