diff options
| author | Kevin E Martin <kem@kem.org> | 2005-12-09 05:31:36 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-12-09 05:31:36 +0000 |
| commit | c16cca19ed1fed6541c63d8e59830caf88facb88 (patch) | |
| tree | 7eb8b544a7b1bfdcd219a5e4090884f51ab06956 | |
| parent | cc0188ab131000dd893f165153efbc81d7bb936f (diff) | |
Bug #5293: Make aliasdir configurable (Donnie Berkholz).
| -rw-r--r-- | 100dpi/Makefile.am | 2 | ||||
| -rw-r--r-- | 75dpi/Makefile.am | 2 | ||||
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | cyrillic/Makefile.am | 2 | ||||
| -rw-r--r-- | misc/Makefile.am | 2 |
6 files changed, 21 insertions, 4 deletions
diff --git a/100dpi/Makefile.am b/100dpi/Makefile.am index 9c90808..5a7a198 100644 --- a/100dpi/Makefile.am +++ b/100dpi/Makefile.am @@ -19,7 +19,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -aliasdir = $(libdir)/X11/fonts/100dpi +aliasdir = @ALIASDIR@/100dpi alias_DATA = fonts.alias EXTRA_DIST = $(alias_DATA) diff --git a/75dpi/Makefile.am b/75dpi/Makefile.am index 6f2d50d..80c70a7 100644 --- a/75dpi/Makefile.am +++ b/75dpi/Makefile.am @@ -19,7 +19,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -aliasdir = $(libdir)/X11/fonts/75dpi +aliasdir = @ALIASDIR@/75dpi alias_DATA = fonts.alias EXTRA_DIST = $(alias_DATA) @@ -0,0 +1,8 @@ +2005-12-09 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * 100dpi/Makefile.am: + * 75dpi/Makefile.am: + * configure.ac: + * cyrillic/Makefile.am: + * misc/Makefile.am: + Bug #5293: Make aliasdir configurable (Donnie Berkholz). diff --git a/configure.ac b/configure.ac index 173f999..296c131 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,15 @@ AM_MAINTAINER_MODE AC_PROG_INSTALL +m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))]) + +DEFAULT_ALIASDIR=${libdir}/X11/fonts +AC_ARG_WITH(aliasdir, + AS_HELP_STRING([--with-aliasdir=ALIASDIR], [Path to install font encodings]), + [ALIASDIR="$withval"], + [ALIASDIR="$DEFAULT_ALIASDIR"]) +AC_SUBST(ALIASDIR) + XORG_RELEASE_VERSION AC_OUTPUT([Makefile diff --git a/cyrillic/Makefile.am b/cyrillic/Makefile.am index 0e52fce..2e134ad 100644 --- a/cyrillic/Makefile.am +++ b/cyrillic/Makefile.am @@ -19,7 +19,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -aliasdir = $(libdir)/X11/fonts/cyrillic +aliasdir = @ALIASDIR@/cyrillic alias_DATA = fonts.alias EXTRA_DIST = $(alias_DATA) diff --git a/misc/Makefile.am b/misc/Makefile.am index 8af2596..7498493 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -19,7 +19,7 @@ # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -aliasdir = $(libdir)/X11/fonts/misc +aliasdir = @ALIASDIR@/misc alias_DATA = fonts.alias EXTRA_DIST = $(alias_DATA) |