public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: rjohnston@sgi.com
To: xfs@oss.sgi.com
Subject: [PATCH V3] xfsprogs: libhandle/Makefile - fix make install-dev
Date: Thu, 23 May 2013 10:37:59 -0500 (CDT)	[thread overview]
Message-ID: <20130523143005.713972968@sgi.com> (raw)
In-Reply-To: 20130522205819.586978467@gulag1.americas.sgi.com

Both make install and make install-dev are required to install all the
pieces of libhandle.

  # rm -f /lib64/libhandle* /usr/lib64/libhandle*
  # make install    
  # ls -l /lib64/libhandle* /usr/lib64/libhandle*
  ls: cannot access /usr/lib64/libhandle*: No such file or directory
  lrwxrwxrwx 1 root root /lib64/libhandle.so.1 -> libhandle.so.1.0.3
  -rwxr-xr-x 1 root root /lib64/libhandle.so.1.0.3

  # rm -f /lib64/libhandle* /usr/lib64/libhandle*
  # make install-dev    
  # ls -l /lib64/libhandle* /usr/lib64/libhandle*
  lrwxrwxrwx 1 root root /lib64/libhandle.a -> /usr/lib64/libhandle.a
  lrwxrwxrwx 1 root root /lib64/libhandle.la -> /usr/lib64/libhandle.la
  lrwxrwxrwx 1 root root /lib64/libhandle.so -> libhandle.so.1
  -rw-r--r-- 1 root root /usr/lib64/libhandle.a
  -rw-r--r-- 1 root root /usr/lib64/libhandle.la
  lrwxrwxrwx 1 root root /usr/lib64/libhandle.so -> /lib64/libhandle.so

Fix the libtool macros INSTALL_LTLIB and INSTALL_LTLIB_DEV.

Signed-off-by: Rich Johnston <rjohnston@sgi.com>
--
V1->V2
As Dave pointed out removing the ltdepend would prevent proper rebuilds.
Don't just make the install work ;) correct the dependancy for install-dev.

V2->V3
Not a libtool expert, make the change to the libtool macros instead of
cluttering up the Makefile.

diff --git a/include/buildmacros b/include/buildmacros
index 7a01880..98d25af 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -54,13 +54,7 @@ LTLDFLAGS += -rpath $(PKG_ROOT_LIB_DIR)
 LTLDFLAGS += -version-info $(LTVERSION)
 endif
 
-ifeq ($(ENABLE_SHARED),yes)
-INSTALL_LTLIB = \
-       cd $(TOPDIR)/$(LIBNAME)/.libs; \
-       ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
-       ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
-       ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR)
-endif
+INSTALL_LTLIB = $(INSTALL_LTLIB_DEV)
 
 # Libtool thinks the static and shared libs should be in the same dir, so
 # make the static lib appear in the place we chose as rpath (using the two
@@ -75,6 +69,8 @@ INSTALL_LTLIB_DEV = \
        ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
        ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
        ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+       ../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+       ../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
        ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
        if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \
        ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

      parent reply	other threads:[~2013-05-23 15:37 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-22 20:58 [PATCH] xfsprogs: libhandle/Makefile - fix make install rjohnston
2013-05-22 21:22 ` Eric Sandeen
2013-05-22 22:05   ` Rich Johnston
2013-05-22 23:04     ` Dave Chinner
2013-05-22 22:16 ` Dave Chinner
2013-05-23 13:52 ` [PATCH V2] xfsprogs: libhandle/Makefile - fix make install-dev rjohnston
2013-05-23 15:37 ` rjohnston [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130523143005.713972968@sgi.com \
    --to=rjohnston@sgi.com \
    --cc=xfs@oss.sgi.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox