Re: app-defaults installation

[Allin C. <cot...@wf...>]

On Tue, 9 Mar 2010, Ethan Merritt wrote:

> On Tuesday 09 March 2010 13:04:40 Allin Cottrell wrote:
> >
> > Something has gone awry with the add-defaults installation in CVS.
> > On doing "make install" I'm seeing this
> >
> > test -z "/usr/local/share/gnuplot/ERSION_MAJOR/app-defaults"
>
> Aha.
> That might explain your other problem as well.
>
> %%%%%%%%%%%%%%%%%
> --- gnuplot/share/Makefile.am   2010-03-07 17:46:15.000000000 -0800
> +++ gnuplot-cvs/share/Makefile.am       2010-03-09 13:22:01.000000000 -0800
> @@ -7,7 +7,7 @@
>  SUBDIRS = LaTeX
>  endif
>
> -appdefaultdir = $(pkgdatadir)/$VERSION_MAJOR/app-defaults
> +appdefaultdir = $(pkgdatadir)/$(VERSION_MAJOR)/app-defaults

Yes, that fixes it. But there's still something a little odd here.
After full updating (CVS, prepare and configure) I have

(a) in src/Makefile:
# Location of X11 app defaults
XAPPLRESDIR = /etc/X11/app-defaults/

(b) in share/Makefile:
appdefaultdir = $(pkgdatadir)/$(VERSION_MAJOR)/app-defaults
...
X11_APPDEFAULTS_DIR = /etc/X11/app-defaults/

"make install" in share uses the pkgdatadir path, not the one
found for X11_APPDEFAULTS_DIR, although it's the latter that gets
compiled into the program.

Allin Cottrell