diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2018-08-24 17:12:20 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-08-24 17:12:20 -0400 |
| commit | feb235e0812d6c5f1fda9e8c790b5bcb78aba285 (patch) | |
| tree | 4bda3b65de3d124027b181295eb4054b5adcfb6d | |
| parent | f2243f1bdcc3ce711157151805e7e78112bcd3bc (diff) | |
| download | android_external_e2fsprogs-feb235e0812d6c5f1fda9e8c790b5bcb78aba285.tar.gz android_external_e2fsprogs-feb235e0812d6c5f1fda9e8c790b5bcb78aba285.tar.bz2 android_external_e2fsprogs-feb235e0812d6c5f1fda9e8c790b5bcb78aba285.zip | |
For --enable-subset, change "make install" so it implies "make install-libs"
The e2fsprogs-libs-1.44.x.tar.gz subset distribution had a hack so
that "make install" would install the libraries via an implied "make
install-libs" --- since after all the tarball had was just the
libraries.
This commit makes "make install" behave the same was as the
e2fsprogs-libs distribution in the case of "configure --enable-subset"
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | configure.ac | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 80ab2994..46273145 100644 --- a/Makefile.in +++ b/Makefile.in @@ -64,7 +64,7 @@ distclean-doc: install: subs all-libs-recursive install-progs-recursive \ install-shlibs-libs-recursive install-doc-libs - if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi +@SUBSET_CMT@ $(MAKE) install-libs install-strip: subs all-libs-recursive install-strip-progs-recursive \ install-shlibs-strip-libs-recursive install-doc-libs @@ -741,6 +741,7 @@ DEFRAG_CMT RESIZER_CMT IMAGER_CMT DEBUGFS_CMT +SUBSET_CMT ALL_CMT BLKID_CMT DEPPROFILED_LIBBLKID @@ -5644,10 +5645,12 @@ fi ALL_CMT= +SUBSET_CMT= # Check whether --enable-subset was given. if test "${enable_subset+set}" = set; then : enableval=$enable_subset; if test "$enableval" = "no" then + SUBSET_CMT=# { $as_echo "$as_me:${as_lineno-$LINENO}: result: Disabling subset-only build" >&5 $as_echo "Disabling subset-only build" >&6; } else @@ -5660,6 +5663,7 @@ fi + # Check whether --enable-backtrace was given. if test "${enable_backtrace+set}" = set; then : enableval=$enable_backtrace; if test "$enableval" = "no" diff --git a/configure.ac b/configure.ac index f365cfa6..51a446d7 100644 --- a/configure.ac +++ b/configure.ac @@ -568,10 +568,12 @@ dnl dnl handle --enable-subset dnl ALL_CMT= +SUBSET_CMT= AC_ARG_ENABLE([subset], [ --enable-subset enable subset-only build], if test "$enableval" = "no" then + SUBSET_CMT=# AC_MSG_RESULT([Disabling subset-only build]) else ALL_CMT=# @@ -579,6 +581,7 @@ else fi ,) AC_SUBST(ALL_CMT) +AC_SUBST(SUBSET_CMT) dnl dnl handle --disable-backtrace dnl |