diff options
| author | LaMont Jones <lamont@debian.org> | 2010-12-29 09:33:45 -0700 |
|---|---|---|
| committer | LaMont Jones <lamont@debian.org> | 2010-12-29 09:33:45 -0700 |
| commit | 4f9e177060fb5ad6e574598aefdf2d5f50a8b54f (patch) | |
| tree | 840ca668a45e389792ccebaa1c414211c59ff620 /Makefile.am | |
| parent | 0d32820f872a43ef8c3021dc9b9741f2b8228b40 (diff) | |
| parent | 6c6f2af9e3949197cf7a70255895a2f4451f2319 (diff) | |
| download | util-linux-old-4f9e177060fb5ad6e574598aefdf2d5f50a8b54f.tar.gz | |
Merge remote branch 'origin/master'
Conflicts:
login-utils/Makefile.am
mount/lomount.c
text-utils/od.1
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 616669d2..368ded44 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,6 +42,10 @@ SUBDIRS += \ partx endif +if BUILD_INIT +SUBDIRS += simpleinit +endif + if BUILD_MOUNT SUBDIRS += mount endif |