diff options
-rw-r--r-- | Makefile.am | 22 | ||||
-rw-r--r-- | configure.ac | 3 |
2 files changed, 10 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 3d0a09f..07c45e7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,15 +19,7 @@ AM_LDFLAGS = ./proc/libprocps.la transform = s/pscommand/ps/; $(program_transform_name) bin_PROGRAMS = \ - ps/pscommand - -sbin_PROGRAMS = \ - sysctl - -lib_LTLIBRARIES = \ - proc/libprocps.la - -usrbin_exec_PROGRAMS = \ + ps/pscommand \ free \ pgrep \ pkill \ @@ -38,6 +30,12 @@ usrbin_exec_PROGRAMS = \ vmstat \ w +sbin_PROGRAMS = \ + sysctl + +lib_LTLIBRARIES = \ + proc/libprocps.la + dist_man_MANS = \ free.1 \ pgrep.1 \ @@ -70,7 +68,7 @@ dist_procpsng_DATA = \ Documentation/FAQ if BUILD_PIDOF -usrbin_exec_PROGRAMS += pidof +bin_PROGRAMS += pidof dist_man_MANS += pidof.1 pidof_SOURCES = pidof.c lib/fileutils.c else @@ -86,7 +84,7 @@ else endif if WITH_NCURSES -usrbin_exec_PROGRAMS += \ +bin_PROGRAMS += \ slabtop \ watch \ top/top @@ -110,7 +108,7 @@ dist_procpsng_DATA += \ endif if BUILD_SKILL -usrbin_exec_PROGRAMS += \ +bin_PROGRAMS += \ skill \ snice skill_SOURCES = skill.c lib/strutils.c lib/fileutils.c lib/nsutils.c diff --git a/configure.ac b/configure.ac index 4b64741..550344e 100644 --- a/configure.ac +++ b/configure.ac @@ -69,9 +69,6 @@ AC_FUNC_MMAP AC_FUNC_REALLOC AC_FUNC_STRTOD -usrbin_execdir='${exec_prefix}/usr/bin' -AC_SUBST([usrbin_execdir]) - AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT([external]) if test -d "$srcdir/po" |