build-sys: correct all Makefile.am files for LOCALEDIR, etc

Some of the latest changes to Makefile.am files are missing.

This patch restores the LOCALEDIR variable, among others,
and dispenses with the include directives in the ps/ and top/
subdirectories since they're no longer needed.

diff --git a/Makefile.am b/Makefile.am
index 8fb59cfc5eef0c87e003fae2001c9d6652876133..aa9503824c3c1314fc176ac750485c2a6f63dc36 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,7 @@
-AM_CPPFLAGS = -include $(top_builddir)/config.h -I$(top_srcdir)/include
+AM_CPPFLAGS = \
+       -include $(top_builddir)/config.h \
+       -I$(top_srcdir)/include \
+       -DLOCALEDIR=\"$(localedir)\"
 
 ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = \

diff --git a/proc/Makefile.am b/proc/Makefile.am
index e90cfd6ce287649db1be14260b5422684183ed11..5216ff5bd1d840e495ef7ca6e3c74abe80c75a21 100644 (file)
--- a/proc/Makefile.am
+++ b/proc/Makefile.am
@@ -1,5 +1,8 @@
 PACKAGE_VERSION = @PACKAGE_VERSION@
-AM_CPPFLAGS = -include $(top_builddir)/config.h
+AM_CPPFLAGS = \
+       -include $(top_builddir)/config.h \
+       -I$(top_srcdir)/include \
+       -DLOCALEDIR=\"$(localedir)\"
 
 LIBprocps_CURRENT=0
 LIBprocps_REVISION=0

diff --git a/ps/Makefile.am b/ps/Makefile.am
index 8634fe2af9256b0ba082dee377f06d84fe17ece4..968d27f42a7630d296d2b8105a521189a5b0bac4 100644 (file)
--- a/ps/Makefile.am
+++ b/ps/Makefile.am
@@ -1,6 +1,8 @@
-AM_CPPFLAGS = -include $(top_builddir)/config.h
+AM_CPPFLAGS = \
+       -include $(top_builddir)/config.h \
+       -I$(top_srcdir)/include \
+       -DLOCALEDIR=\"$(localedir)\"
 
-AM_CFLAGS = -I../proc -I../include
 AM_LDFLAGS = ../proc/libprocps.la
 
 dist_man_MANS = ps.1

diff --git a/top/Makefile.am b/top/Makefile.am
index 714a04e708ff82d03b2816461cc99504fe3e2a25..b7c9f9f5c783b850bb8c5143a3dc35ff9153c482 100644 (file)
--- a/top/Makefile.am
+++ b/top/Makefile.am
@@ -1,6 +1,8 @@
-AM_CPPFLAGS = -include $(top_builddir)/config.h
+AM_CPPFLAGS = \
+       -include $(top_builddir)/config.h \
+       -I$(top_srcdir)/include \
+       -DLOCALEDIR=\"$(localedir)\"
 
-AM_CFLAGS = -I../proc -I../include
 AM_LDFLAGS = ../proc/libprocps.la
 
 if WITH_NCURSES