From 2be5aaf9cd769d29299b91f66620b7767f1cc093 Mon Sep 17 00:00:00 2001 From: Tim Retout Date: Sat, 9 Jul 2011 23:26:52 +0100 Subject: [PATCH] Use $(datadir) instead of $(prefix)/share. Signed-off-by: Tim Retout --- ChangeLog | 4 ++++ src/Makefile.am | 2 +- states/Makefile.am | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70c8662..0f60a64 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2011-07-09 Tim Retout + * states/Makefile.am: Use $(datadir) instead of $(prefix)/share. + Savannah bug #31609. + * src/Makefile.am: Likewise. + * src/Makefile.am: Remove ansi2knr option and supporting files. * afmlib/Makefile.am: Likewise. diff --git a/src/Makefile.am b/src/Makefile.am index c268b05..b30a8c0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -40,7 +40,7 @@ mkafmmap_DEPENDENCIES = ../afmlib/libafm.a ../compat/libcompat.a noinst_HEADERS = gsint.h -localedir = $(prefix)/share/locale +localedir = $(datadir)/locale INCLUDES = -I$(srcdir)/../compat -I$(srcdir)/../afmlib \ -I$(srcdir)/../intl -I../intl -DLOCALEDIR=\"$(localedir)\" \ diff --git a/states/Makefile.am b/states/Makefile.am index 6608ff0..03f23c1 100644 --- a/states/Makefile.am +++ b/states/Makefile.am @@ -42,13 +42,13 @@ noinst_HEADERS = defs.h gram.h EXTRA_DIST = ChangeLog.old TODO over.in enscript.el -localedir = $(prefix)/share/locale +localedir = $(datadir)/locale bin_SCRIPTS = over CLEANFILES = $(bin_SCRIPTS) over: $(srcdir)/over.in - sed 's%@LIBRARYDIR@%$(prefix)/share/enscript%g' \ + sed 's%@LIBRARYDIR@%$(datadir)/enscript%g' \ $(srcdir)/over.in > over AM_YFLAGS = -d -- 2.34.1