misc: shift install targets

Modify each Makefile so that "install-pkg" installs the main package
contents, and "install" just invokes "install-pkg".  We'll need this
indirection for the next patch where we add an install-selfheal target
to build the xfsprogs-self-healing package but will still want 'make
install' to install everything on a developer's workstation.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>

diff --git a/Makefile b/Makefile
index 4e768526c6fe0c71349908fab37a6a15ca4a30d5..44b6c35015390651e5df19e24b2324d460675341 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -116,15 +116,17 @@ configure: configure.ac
 include/builddefs: configure
        ./configure $$LOCAL_CONFIGURE_OPTIONS
 
-install: $(addsuffix -install,$(SUBDIRS))
+install: install-pkg
+
+install-pkg: $(addsuffix -install-pkg,$(SUBDIRS))
        $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
        $(INSTALL) -m 644 README $(PKG_DOC_DIR)
 
 install-dev: $(addsuffix -install-dev,$(SUBDIRS))
 
-%-install:
+%-install-pkg:
        @echo "Installing $@"
-       $(Q)$(MAKE) $(MAKEOPTS) -C $* install
+       $(Q)$(MAKE) $(MAKEOPTS) -C $* install-pkg
 
 %-install-dev:
        @echo "Installing $@"

diff --git a/copy/Makefile b/copy/Makefile
index 55160f848225379061e5a77d90f1aecbee718087..446d38bea5761525bd0e4b34e46080ed13e230ba 100644 (file)
--- a/copy/Makefile
+++ b/copy/Makefile
@@ -18,7 +18,9 @@ default: depend $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
 install-dev:

diff --git a/db/Makefile b/db/Makefile
index 83389376c36c4678ace19456a852a7404a6afa38..91e259044beb063460889c2af00dba6665e43dbc 100644 (file)
--- a/db/Makefile
+++ b/db/Makefile
@@ -81,7 +81,9 @@ default: depend $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
        $(INSTALL) -m 755 xfs_admin.sh $(PKG_SBIN_DIR)/xfs_admin

diff --git a/debian/Makefile b/debian/Makefile
index 2f9cd38c2ea6be4d476b4b8deafb8de5d4dd994c..f6a996e91871fbf3c2272021c1c329d4b79c6974 100644 (file)
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -15,7 +15,9 @@ default:
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
 ifeq ($(PKG_DISTRIBUTION), debian)
        $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
        $(INSTALL) -m 644 changelog $(PKG_DOC_DIR)/changelog.Debian

diff --git a/debian/rules b/debian/rules
index 69a79fc6740526b8130dbe35bfb269091b1e742b..e4eb2499e768d35216a56a7674f80fe00cfd5486 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -100,7 +100,7 @@ binary-arch: checkroot built
        @echo "== dpkg-buildpackage: binary-arch" 1>&2
        $(checkdir)
        -rm -rf $(dirme) $(dirdev) $(dirdi)
-       $(pkgme)  $(MAKE) -C . install
+       $(pkgme)  $(MAKE) -C . install-pkg
        $(pkgdev) $(MAKE) -C . install-dev
        $(pkgdi)  $(MAKE) -C debian install-d-i
        $(pkgme)  $(MAKE) dist

diff --git a/doc/Makefile b/doc/Makefile
index 83dfa38bedd138916649237a26f7ed1ef9a945d7..ad6749b8d0be2a908d6e7185cd215a7d1b020e93 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -16,7 +16,9 @@ CHANGES.gz:
        @echo "    [ZIP]    $@"
        $(Q)$(ZIP) --best -c < CHANGES > $@
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
        $(INSTALL) -m 644 CHANGES.gz CREDITS $(PKG_DOC_DIR)
 ifeq ($(PKG_DISTRIBUTION), debian)

diff --git a/estimate/Makefile b/estimate/Makefile
index 1080129b3a629a6e8dbadb73d0e464efff82a697..d5f8a6d81d6506841acb2461d85f7ab1feb5cc82 100644 (file)
--- a/estimate/Makefile
+++ b/estimate/Makefile
@@ -12,7 +12,9 @@ default: depend $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
 install-dev:

diff --git a/fsck/Makefile b/fsck/Makefile
index 5ca529f53e428f9620142c0dc4c2d68b70708537..ccba7f0b68921b9e97b485d1fc31571713fc9d99 100644 (file)
--- a/fsck/Makefile
+++ b/fsck/Makefile
@@ -11,7 +11,9 @@ default: $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(INSTALL) -m 755 xfs_fsck.sh $(PKG_SBIN_DIR)/fsck.xfs
 install-dev:

diff --git a/fsr/Makefile b/fsr/Makefile
index d57f2de24c229e14316728df3d3ed2cbddf26970..3ad9f6d824c686f4d352aa88f2bbfa5db1bf8ca0 100644 (file)
--- a/fsr/Makefile
+++ b/fsr/Makefile
@@ -15,7 +15,9 @@ default: depend $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
 install-dev:

diff --git a/growfs/Makefile b/growfs/Makefile
index 2f4cc66a76f35805eb2c6a9edb9b9339ab8a769b..e0ab870bd6ba8a9c23e341d3884cac619b371b19 100644 (file)
--- a/growfs/Makefile
+++ b/growfs/Makefile
@@ -23,7 +23,9 @@ default: depend $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
 install-dev:

diff --git a/include/Makefile b/include/Makefile
index f7c40a5ce1a1c245cb42fb3fc5e436d6699ac35d..23727fccfdcda2d752f8021166325c5e1508b2fd 100644 (file)
--- a/include/Makefile
+++ b/include/Makefile
@@ -57,7 +57,9 @@ install-headers: $(addsuffix -hdrs, $(DKHFILES) $(HFILES))
 %-hdrs:
        $(Q)$(LN_S) -f $(CURDIR)/$* xfs/$*
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_INC_DIR)
 
 install-dev: install

diff --git a/io/Makefile b/io/Makefile
index 3192b813c7401af2296a7f64f69c1118ef153d61..d035420b555c074cc33064d59ff652c136bb3cd5 100644 (file)
--- a/io/Makefile
+++ b/io/Makefile
@@ -85,7 +85,9 @@ default: depend $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 xfs_bmap.sh $(PKG_SBIN_DIR)/xfs_bmap

diff --git a/libfrog/Makefile b/libfrog/Makefile
index acddc894ee9395d53a6a37dcd3d244b534a9fe42..5ebe36fb58c890a941f26f661c96dd2471877b34 100644 (file)
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -79,6 +79,6 @@ crc32table.h: gen_crc32table.c crc32defs.h
 
 include $(BUILDRULES)
 
-install install-dev: default
+install install-pkg install-dev: default
 
 -include .ltdep

diff --git a/libhandle/Makefile b/libhandle/Makefile
index f297a59e47f99e3959807162d33c26afc8bfd6db..7cfd0fa4f27ef10810a266f8a73d470eabe0fb43 100644 (file)
--- a/libhandle/Makefile
+++ b/libhandle/Makefile
@@ -19,7 +19,9 @@ default: ltdepend $(LTLIBRARY)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL_LTLIB)
 
 install-dev: default

diff --git a/libxcmd/Makefile b/libxcmd/Makefile
index 70e54308c34b84d1daffc9b276b800dc0759b359..afd5349c8af3afe047c8210944c449b1d8e07a40 100644 (file)
--- a/libxcmd/Makefile
+++ b/libxcmd/Makefile
@@ -23,6 +23,6 @@ default: ltdepend $(LTLIBRARY)
 
 include $(BUILDRULES)
 
-install install-dev: default
+install install-pkg install-dev: default
 
 -include .ltdep

diff --git a/libxfs/Makefile b/libxfs/Makefile
index 2f2791cae5873c962e9f6e1e65fba72e1a6bae66..2c6b4595366120eb75347f335ceb3c7ec087b755 100644 (file)
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -140,7 +140,9 @@ default: ltdepend $(LTLIBRARY)
 # set up include/xfs header directory
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_INC_DIR)
 
 install-headers: $(addsuffix -hdrs, $(PKGHFILES))

diff --git a/libxlog/Makefile b/libxlog/Makefile
index b0f5ef15413308556263ba15bd99af7a590bc982..3710729fe7035a58765063b2c618c3fa3249aa73 100644 (file)
--- a/libxlog/Makefile
+++ b/libxlog/Makefile
@@ -21,6 +21,6 @@ default: ltdepend $(LTLIBRARY)
 
 include $(BUILDRULES)
 
-install install-dev: default
+install install-pkg install-dev: default
 
 -include .ltdep

diff --git a/logprint/Makefile b/logprint/Makefile
index bbbed5d259afb517ec9cc24c22e8e157974dd264..5ec02539a7bb66d75e3364b6e25d32308e3ae1e3 100644 (file)
--- a/logprint/Makefile
+++ b/logprint/Makefile
@@ -21,7 +21,9 @@ default: depend $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
 install-dev:

diff --git a/m4/Makefile b/m4/Makefile
index 84174c3d3e3023f40fb2e27878cc9110a38ab546..eda4c06f6864dc7d4700524e383209e175baea94 100644 (file)
--- a/m4/Makefile
+++ b/m4/Makefile
@@ -33,7 +33,7 @@ default:
 
 include $(BUILDRULES)
 
-install install-dev install-lib: default
+install install-pkg install-dev install-lib: default
 
 realclean: distclean
        rm -f $(CONFIGURE)

diff --git a/man/Makefile b/man/Makefile
index cd1aed6cf202e0949c9a0244cb4854697b1c9e48..f62286e8339d3913e8fc418a6044661d66b81b6a 100644 (file)
--- a/man/Makefile
+++ b/man/Makefile
@@ -9,12 +9,14 @@ SUBDIRS = man2 man3 man5 man8
 
 default : $(SUBDIRS)
 
-install : $(addsuffix -install,$(SUBDIRS))
+install : install-pkg
+
+install-pkg : $(addsuffix -install-pkg,$(SUBDIRS))
 
 install-dev : $(addsuffix -install-dev,$(SUBDIRS))
 
-%-install:
-       $(Q)$(MAKE) $(MAKEOPTS) -C $* install
+%-install-pkg:
+       $(Q)$(MAKE) $(MAKEOPTS) -C $* install-pkg
 
 %-install-dev:
        $(Q)$(MAKE) $(MAKEOPTS) -C $* install-dev

diff --git a/man/man2/Makefile b/man/man2/Makefile
index 8aecde3321b01613e495c576a2911b1da9223e0f..190ea18e7c6c428eda41ce9eff93b41b97e49c32 100644 (file)
--- a/man/man2/Makefile
+++ b/man/man2/Makefile
@@ -15,7 +15,9 @@ default : $(MAN_PAGES)
 
 include $(BUILDRULES)
 
-install :
+install : install-pkg
+
+install-pkg :
 
 install-dev : default
        $(INSTALL) -m 755 -d $(MAN_DEST)

diff --git a/man/man3/Makefile b/man/man3/Makefile
index a7f607fcbad9fefd3907a68ef14d80554a3deea8..1553e2b2de82b2a2e0b7270e208bd443c6c89852 100644 (file)
--- a/man/man3/Makefile
+++ b/man/man3/Makefile
@@ -15,7 +15,9 @@ default : $(MAN_PAGES)
 
 include $(BUILDRULES)
 
-install :
+install : install-pkg
+
+install-pkg :
 
 install-dev : default
        $(INSTALL) -m 755 -d $(MAN_DEST)

diff --git a/man/man5/Makefile b/man/man5/Makefile
index fe0aef6f016b70238f751f569d314397c2b657ce..1fcd3995036fa9ad7301d80b762aca0a8ad3b6db 100644 (file)
--- a/man/man5/Makefile
+++ b/man/man5/Makefile
@@ -15,7 +15,10 @@ default : $(MAN_PAGES)
 
 include $(BUILDRULES)
 
-install : default
+install : install-pkg
+
+install-pkg : default
        $(INSTALL) -m 755 -d $(MAN_DEST)
        $(INSTALL_MAN)
+
 install-dev :

diff --git a/man/man8/Makefile b/man/man8/Makefile
index 5be76ab727a1fe2e476ee4c0fd80a138be8977a9..0b40a409a9131d3847e34aba4bc315b93610bffd 100644 (file)
--- a/man/man8/Makefile
+++ b/man/man8/Makefile
@@ -22,7 +22,9 @@ default : $(MAN_PAGES)
 
 include $(BUILDRULES)
 
-install : default
+install : install-pkg
+
+install-pkg : default
        $(INSTALL) -m 755 -d $(MAN_DEST)
        $(INSTALL_MAN)
 

diff --git a/mdrestore/Makefile b/mdrestore/Makefile
index 4a932efb8098bad5678c348c35faa43b1575f468..0d02fb383404fec9e1027e007713e67a7f07ec86 100644 (file)
--- a/mdrestore/Makefile
+++ b/mdrestore/Makefile
@@ -16,7 +16,9 @@ default: depend $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
 install-dev:

diff --git a/mkfs/Makefile b/mkfs/Makefile
index a6173083e4c2d4557260826925bb7ad5e261ab81..cf945aa10c251eed7c0ccc81f9e6812e6324e425 100644 (file)
--- a/mkfs/Makefile
+++ b/mkfs/Makefile
@@ -27,7 +27,9 @@ default: depend $(LTCOMMAND) $(CFGFILES)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
        $(INSTALL) -m 755 -d $(MKFS_CFG_DIR)

diff --git a/po/Makefile b/po/Makefile
index 1d35f5191ba2f649ed5036fc35a4cc8a1db7b2da..3cc0b4177c64501dcf3834ddfdc98e17b25a54da 100644 (file)
--- a/po/Makefile
+++ b/po/Makefile
@@ -19,7 +19,9 @@ default: $(POTHEAD) $(LINGUAS:%=%.mo)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL_LINGUAS)
 
 install-dev install-lib:

diff --git a/quota/Makefile b/quota/Makefile
index da5a1489e468b2828e14bd72b183186d448363e5..01584635b3ddc28c7207dd08ac12c2bbfdcea9b8 100644 (file)
--- a/quota/Makefile
+++ b/quota/Makefile
@@ -23,7 +23,9 @@ default: depend $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
 install-dev:

diff --git a/repair/Makefile b/repair/Makefile
index a36a95e353a50497c91985821db3d36381d8c2a2..096ae8c6a5b1d23933ade36f73ed079acd3dfa82 100644 (file)
--- a/repair/Makefile
+++ b/repair/Makefile
@@ -106,7 +106,9 @@ include $(BUILDRULES)
 #
 #CFLAGS += ...
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
 install-dev:

diff --git a/rtcp/Makefile b/rtcp/Makefile
index 264b4f27b5fddbb834d9fecf75655dc8217fceae..4adb58c4b7830cab5e0082c29cf67296da25eb52 100644 (file)
--- a/rtcp/Makefile
+++ b/rtcp/Makefile
@@ -16,7 +16,9 @@ default: depend $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
 install-dev:

diff --git a/scrub/Makefile b/scrub/Makefile
index 885b43e9948daff8ec5e544a184c69c243d18c92..653aafd171b5e9cf6c8c93a062c5723960333ee3 100644 (file)
--- a/scrub/Makefile
+++ b/scrub/Makefile
@@ -138,7 +138,9 @@ phase5.o unicrash.o xfs.o: $(builddefs)
 
 include $(BUILDRULES)
 
-install: $(INSTALL_SCRUB)
+install: install-pkg
+
+install-pkg: $(INSTALL_SCRUB)
 
 %.service: %.service.in $(builddefs)
        @echo "    [SED]    $@"

diff --git a/spaceman/Makefile b/spaceman/Makefile
index e914b921de8b500d102e2973ae0809a8d725575e..49fbc9290c02697752e4bdca326a537ec5a61add 100644 (file)
--- a/spaceman/Makefile
+++ b/spaceman/Makefile
@@ -38,7 +38,9 @@ default: depend $(LTCOMMAND)
 
 include $(BUILDRULES)
 
-install: default
+install: install-pkg
+
+install-pkg: default
        $(INSTALL) -m 755 -d $(PKG_SBIN_DIR)
        $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR)
        $(INSTALL) -m 755 xfs_info.sh $(PKG_SBIN_DIR)/xfs_info