Mercurial > octave

comparison configure.ac @ 12710:762d10c77277 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: use libdir for .oct files, not libexecdir From Orion Poplawski <orion@cora.nwra.com>. * configure.ac (octlibdir): Use octave/$(version), not octave-$(version). (octfiledir): Use $(libdir), not $(libexecdir). (localoctfiledir): Likewise. (localapioctfiledir): Likewise. (localveroctfiledir): Likewise. * pkg.m: Use libdir instead of libexecdir as needed.
author John W. Eaton <jwe@octave.org>
date Mon, 06 Jun 2011 11:54:15 -0400
parents 6a225fb7d361
children 630068170ef0
comparison
equal deleted inserted replaced
12709:96180026afc5 12710:762d10c77277
123 OCTAVE_SET_DEFAULT(localfcnfiledir, '$(datadir)/octave/site/m') 123 OCTAVE_SET_DEFAULT(localfcnfiledir, '$(datadir)/octave/site/m')
124 OCTAVE_SET_DEFAULT(localapifcnfiledir, 124 OCTAVE_SET_DEFAULT(localapifcnfiledir,
125 '$(datadir)/octave/site/$(api_version)/m') 125 '$(datadir)/octave/site/$(api_version)/m')
126 OCTAVE_SET_DEFAULT(localverfcnfiledir, '$(datadir)/octave/$(version)/site/m') 126 OCTAVE_SET_DEFAULT(localverfcnfiledir, '$(datadir)/octave/$(version)/site/m')
127 OCTAVE_SET_DEFAULT(octetcdir, '$(datadir)/octave/$(version)/etc') 127 OCTAVE_SET_DEFAULT(octetcdir, '$(datadir)/octave/$(version)/etc')
128 OCTAVE_SET_DEFAULT(octlibdir, '$(libdir)/octave-$(version)') 128 OCTAVE_SET_DEFAULT(octlibdir, '$(libdir)/octave/$(version)')
129 OCTAVE_SET_DEFAULT(archlibdir, 129 OCTAVE_SET_DEFAULT(archlibdir,
130 '$(libexecdir)/octave/$(version)/exec/$(canonical_host_type)') 130 '$(libexecdir)/octave/$(version)/exec/$(canonical_host_type)')
131 OCTAVE_SET_DEFAULT(localarchlibdir, 131 OCTAVE_SET_DEFAULT(localarchlibdir,
132 '$(libexecdir)/octave/site/exec/$(canonical_host_type)') 132 '$(libexecdir)/octave/site/exec/$(canonical_host_type)')
133 OCTAVE_SET_DEFAULT(localapiarchlibdir, 133 OCTAVE_SET_DEFAULT(localapiarchlibdir,
134 '$(libexecdir)/octave/$(api_version)/site/exec/$(canonical_host_type)') 134 '$(libexecdir)/octave/$(api_version)/site/exec/$(canonical_host_type)')
135 OCTAVE_SET_DEFAULT(localverarchlibdir, 135 OCTAVE_SET_DEFAULT(localverarchlibdir,
136 '$(libexecdir)/octave/$(version)/site/exec/$(canonical_host_type)') 136 '$(libexecdir)/octave/$(version)/site/exec/$(canonical_host_type)')
137 OCTAVE_SET_DEFAULT(octfiledir, 137 OCTAVE_SET_DEFAULT(octfiledir,
138 '$(libexecdir)/octave/$(version)/oct/$(canonical_host_type)') 138 '$(libdir)/octave/$(version)/oct/$(canonical_host_type)')
139 OCTAVE_SET_DEFAULT(localoctfiledir, 139 OCTAVE_SET_DEFAULT(localoctfiledir,
140 '$(libexecdir)/octave/site/oct/$(canonical_host_type)') 140 '$(libdir)/octave/site/oct/$(canonical_host_type)')
141 OCTAVE_SET_DEFAULT(localapioctfiledir, 141 OCTAVE_SET_DEFAULT(localapioctfiledir,
142 '$(libexecdir)/octave/site/oct/$(api_version)/$(canonical_host_type)') 142 '$(libdir)/octave/site/oct/$(api_version)/$(canonical_host_type)')
143 OCTAVE_SET_DEFAULT(localveroctfiledir, 143 OCTAVE_SET_DEFAULT(localveroctfiledir,
144 '$(libexecdir)/octave/$(version)/site/oct/$(canonical_host_type)') 144 '$(libdir)/octave/$(version)/site/oct/$(canonical_host_type)')
145 OCTAVE_SET_DEFAULT(imagedir, '$(datadir)/octave/$(version)/imagelib') 145 OCTAVE_SET_DEFAULT(imagedir, '$(datadir)/octave/$(version)/imagelib')
146 146
147 ### Find pkg-config executable (sets $PKG_CONFIG) 147 ### Find pkg-config executable (sets $PKG_CONFIG)
148 148
149 PKG_PROG_PKG_CONFIG 149 PKG_PROG_PKG_CONFIG