Use $(datadir) instead of $(prefix)/share.

Signed-off-by: Tim Retout <diocles@gnu.org>

diff --git a/ChangeLog b/ChangeLog
index 70c86623630546b7cd1cd2d5c1cc6886db9358ef..0f60a640f3f2e7185fb171ecc5234fcd43440222 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2011-07-09  Tim Retout  <diocles@gnu.org>
 
+       * 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 c268b053ee8a227abfab0457640c7ab2374cf913..b30a8c06db4f45583004c08a66acb5d49cd073e9 100644 (file)
--- 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 6608ff0679cd3a8babf57df346d834b2a8bf1d7e..03f23c1fbacbc9feb294d13ee615b0d0e8a23a51 100644 (file)
--- 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