From: Nathan Scott Date: Mon, 16 Jul 2001 11:42:38 +0000 (+0000) Subject: use LTINSTALL for libtool created binaries (wraps our install-sh). X-Git-Tag: v2.0.0~91 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0f0a2eadeb81f62850873dd9962205bee89b3150;p=thirdparty%2Fxfsprogs-dev.git use LTINSTALL for libtool created binaries (wraps our install-sh). --- diff --git a/bmap/Makefile b/bmap/Makefile index f5e09a572..81d5d7238 100644 --- a/bmap/Makefile +++ b/bmap/Makefile @@ -43,5 +43,5 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(PKG_BIN_DIR) - $(INSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) install-dev: diff --git a/db/Makefile b/db/Makefile index 2fc3a9d6a..806d167c9 100644 --- a/db/Makefile +++ b/db/Makefile @@ -53,7 +53,7 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(PKG_BIN_DIR) - $(INSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) $(INSTALL) -m 755 xfs_admin.sh $(PKG_BIN_DIR)/xfs_admin $(INSTALL) -m 755 xfs_check.sh $(PKG_BIN_DIR)/xfs_check $(INSTALL) -m 755 xfs_ncheck.sh $(PKG_BIN_DIR)/xfs_ncheck diff --git a/freeze/Makefile b/freeze/Makefile index e583e4fc7..dd0402ef9 100644 --- a/freeze/Makefile +++ b/freeze/Makefile @@ -44,5 +44,5 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(PKG_BIN_DIR) - $(INSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) install-dev: diff --git a/fsck/Makefile b/fsck/Makefile index 5d9cce43d..d520e67af 100644 --- a/fsck/Makefile +++ b/fsck/Makefile @@ -44,5 +44,5 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) - $(INSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: diff --git a/growfs/Makefile b/growfs/Makefile index 27bda6711..d0d8e500c 100644 --- a/growfs/Makefile +++ b/growfs/Makefile @@ -46,6 +46,6 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(PKG_BIN_DIR) - $(INSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) $(INSTALL) -m 755 xfs_info.sh $(PKG_BIN_DIR)/xfs_info install-dev: diff --git a/include/builddefs.in b/include/builddefs.in index 56502c491..af0e360e8 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -122,6 +122,7 @@ top_builddir = $(TOPDIR) DIRT += $(LTOBJECTS) $(LTLIBRARY) LTLINK = $(LIBTOOL) --mode=link $(CC) LTEXEC = $(LIBTOOL) --mode=execute +LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL) LTCOMPILE = $(LIBTOOL) --mode=compile $(CCF) -D_REENTRANT LTVERSION = $(LT_CURRENT).$(LT_REVISION).$(LT_AGE) LTOBJECTS = $(OBJECTS:.o=.lo) @@ -144,7 +145,7 @@ ifeq ($(ENABLE_SHARED),yes) INSTALL_LTLIB_DEV = \ cd $(TOPDIR)/$(LIBNAME)/.libs; \ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ - ../$(INSTALL) -m 644 $(LIBNAME).a $(PKG_LIB_DIR); \ + ../$(INSTALL) -m 644 $(LIBNAME).a $(LIBNAME).la $(PKG_LIB_DIR); \ ../$(INSTALL) -S $(LIBNAME).so.$(LT_CURRENT) $(PKG_LIB_DIR)/$(LIBNAME).so else INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) diff --git a/logprint/Makefile b/logprint/Makefile index 86d06941a..640f87993 100644 --- a/logprint/Makefile +++ b/logprint/Makefile @@ -47,5 +47,5 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(PKG_BIN_DIR) - $(INSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) install-dev: diff --git a/mkfile/Makefile b/mkfile/Makefile index a1d9dd329..0e316d136 100644 --- a/mkfile/Makefile +++ b/mkfile/Makefile @@ -43,5 +43,5 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(PKG_BIN_DIR) - $(INSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) install-dev: diff --git a/mkfs/Makefile b/mkfs/Makefile index 527fc471c..622f49c9f 100644 --- a/mkfs/Makefile +++ b/mkfs/Makefile @@ -66,5 +66,5 @@ $(FSTYP): install: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) - $(INSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: diff --git a/repair/Makefile b/repair/Makefile index a19c419e8..6537f299f 100644 --- a/repair/Makefile +++ b/repair/Makefile @@ -70,5 +70,5 @@ CFLAGS += -DAVL_USER_MODE -DAVL_FUTURE_ENHANCEMENTS install: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) - $(INSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: diff --git a/rtcp/Makefile b/rtcp/Makefile index b4544ad94..f562da36d 100644 --- a/rtcp/Makefile +++ b/rtcp/Makefile @@ -43,5 +43,5 @@ include $(BUILDRULES) install: default $(INSTALL) -m 755 -d $(PKG_BIN_DIR) - $(INSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) + $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_BIN_DIR) install-dev: