public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: meyering@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2/test Makefile.in Date: Tue, 18 Sep 2007 14:01:00 -0000 [thread overview] Message-ID: <20070918140124.4954.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: meyering@sourceware.org 2007-09-18 14:01:24 Modified files: test : Makefile.in Log message: Clean up shared-lib support in test/. * test/Makefile.in (so_name): Use @DMDIR@. (.bin-dir-stamp): Create symlink only if @DMDIR@ is nonempty. (lvm-wrapper): Emit LD_LIBRARY_PATH setting only if @DMDIR@ is nonempty. Based on a patch from Jun'ichi Nomura. Author: Jim Meyering <jim@meyering.net> Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/test/Makefile.in.diff?cvsroot=lvm2&r1=1.1&r2=1.2 --- LVM2/test/Makefile.in 2007/09/18 14:00:42 1.1 +++ LVM2/test/Makefile.in 2007/09/18 14:01:24 1.2 @@ -42,13 +42,13 @@ @echo "*** $@ ***"; '$(SHELL_PATH_SQ)' \ $(TESTS_ENVIRONMENT) $@ $(GIT_TEST_OPTS) -dmdir = $(abs_top_srcdir)/../device-mapper -so_name = $(dmdir)/lib/ioctl/libdevmapper.so.1.02 +so_name = @DMDIR@/lib/ioctl/libdevmapper.so.1.02 -# Having to create this link is a huge kludge, +# Having to create this symlink is an ugly kludge, # and a major argument for including device-mapper in lvm. .bin-dir-stamp: lvm-wrapper - ln -fs libdevmapper.so $(so_name) + test -n "@DMDIR@" \ + && ln -fs libdevmapper.so $(so_name) rm -rf bin mkdir bin for i in lvm $$(cat $(top_srcdir)/tools/.commands); do \ @@ -59,7 +59,8 @@ lvm-wrapper: Makefile rm -f $@-t $@ echo '#!/bin/sh' >> $@-t - echo 'export LD_LIBRARY_PATH="$(dmdir)/lib/ioctl"' >> $@-t + test -n "@DMDIR@" \ + && echo 'export LD_LIBRARY_PATH="@DMDIR@/lib/ioctl"' >> $@-t echo 'cmd=$$(echo ./$$0|sed "s,.*/,,")' >> $@-t echo 'test "$$cmd" = lvm &&' >> $@-t echo 'exec "$(abs_top_builddir)/tools/lvm" "$$@"' >> $@-t
next reply other threads:[~2007-09-18 14:01 UTC|newest] Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top 2007-09-18 14:01 meyering [this message] 2007-09-18 14:29 meyering 2008-08-05 12:32 zkabelac 2008-09-29 16:07 mornfall 2008-11-04 14:37 mornfall 2008-11-07 1:30 mornfall 2009-11-02 15:16 mornfall 2009-11-19 12:01 mornfall 2009-11-30 14:59 mornfall 2009-11-30 16:56 mornfall 2009-11-30 16:58 mornfall 2010-03-18 9:28 mornfall 2010-03-29 14:19 zkabelac 2010-03-29 15:39 zkabelac 2010-03-29 15:53 zkabelac 2010-03-31 23:05 zkabelac 2010-04-13 6:45 mornfall 2010-05-12 11:59 mornfall 2010-10-12 16:17 mornfall 2010-12-12 21:17 mornfall 2010-12-14 17:38 mornfall 2010-12-14 23:23 mornfall 2011-01-07 12:26 mornfall 2011-01-13 14:59 zkabelac 2011-01-17 15:18 zkabelac 2011-04-19 15:28 mornfall 2011-04-21 17:42 wysochanski 2011-04-28 22:17 zkabelac 2011-09-19 12:50 zkabelac 2011-09-19 15:54 zkabelac 2011-11-20 21:55 mornfall 2011-11-23 13:03 zkabelac 2012-03-14 17:14 zkabelac
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=20070918140124.4954.qmail@sourceware.org \ --to=meyering@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.org \ /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: linkBe 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; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).