emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

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

Browse Source 
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.
This commit is contained in:
Jim Warner
2012-01-02 09:08:58 -06:00
committed by Craig Small
parent e64b6f70d7
commit 3388f65c03
4 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.am
View File

@ -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 ACLOCAL_AMFLAGS = -I m4
SUBDIRS = \ SUBDIRS = \

5
proc/Makefile.am
View File

@ -1,5 +1,8 @@
PACKAGE_VERSION = @PACKAGE_VERSION@ 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_CURRENT=0
LIBprocps_REVISION=0 LIBprocps_REVISION=0

6
ps/Makefile.am
View File

@ -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 AM_LDFLAGS = ../proc/libprocps.la
dist_man_MANS = ps.1 dist_man_MANS = ps.1

6
top/Makefile.am
View File

@ -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 AM_LDFLAGS = ../proc/libprocps.la
if WITH_NCURSES if WITH_NCURSES