diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-01-22 01:11:22 +0300 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-01-22 01:11:22 +0300 |
| commit | 7ddd430bf93e55b1497f448a68bad9ac46938e74 (patch) | |
| tree | d63941c3a9c7feb4f659e11acd35a436a9de490b | |
| parent | 0ad6f4dcbec5d8baa38045c3df7315690d727662 (diff) | |
| download | util-linux-old-7ddd430bf93e55b1497f448a68bad9ac46938e74.tar.gz | |
For non-linux build inly flock (ipc* for Illumos have zone support)
| -rw-r--r-- | sys-utils/Makefile.am | 14 | ||||
| -rw-r--r-- | sys-utils/flock.c | 1 | ||||
| -rw-r--r-- | sys-utils/ipcs.c | 1 |
3 files changed, 11 insertions, 5 deletions
diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am index ee6f2d74..7d3ab8cf 100644 --- a/sys-utils/Makefile.am +++ b/sys-utils/Makefile.am @@ -2,17 +2,21 @@ include $(top_srcdir)/config/include-Makefile.am bin_PROGRAMS = sbin_PROGRAMS = -usrbin_exec_PROGRAMS = flock ipcrm ipcs ipcmk renice setsid -usrsbin_exec_PROGRAMS = readprofile +usrsbin_exec_PROGRAMS = +usrbin_exec_PROGRAMS = flock -dist_man_MANS = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 setsid.1 \ - readprofile.1 +dist_man_MANS = flock.1 + +flock_LDADD = -L$(top_builddir)/gnulib -lgnu if LINUX bin_PROGRAMS += dmesg sbin_PROGRAMS += ctrlaltdel fsfreeze fstrim usrbin_exec_PROGRAMS += cytune setarch -usrsbin_exec_PROGRAMS += ldattach tunelp rtcwake +usrsbin_exec_PROGRAMS += ldattach tunelp rtcwake readprofile +usrbin_exec_PROGRAMS += ipcrm ipcs ipcmk renice setsid +dist_man_MANS += ipcrm.1 ipcs.1 ipcmk.1 renice.1 setsid.1 \ + readprofile.1 dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \ ldattach.8 tunelp.8 rtcwake.8 fsfreeze.8 fstrim.8 diff --git a/sys-utils/flock.c b/sys-utils/flock.c index 20004cae..9c6df8f8 100644 --- a/sys-utils/flock.c +++ b/sys-utils/flock.c @@ -34,6 +34,7 @@ #include <ctype.h> #include <string.h> #include <paths.h> +#include <fcntl.h> #include <sysexits.h> #include <sys/types.h> #include <sys/file.h> diff --git a/sys-utils/ipcs.c b/sys-utils/ipcs.c index 0a950f66..a0794e9f 100644 --- a/sys-utils/ipcs.c +++ b/sys-utils/ipcs.c @@ -27,6 +27,7 @@ #include <grp.h> #include <unistd.h> #include <err.h> +#include <argp.h> #include <sys/types.h> #include <sys/ipc.h> #include <sys/sem.h> |