diff options
| author | Karel Zak | 2009-07-04 01:18:01 +0200 |
|---|---|---|
| committer | Karel Zak | 2009-07-04 01:23:41 +0200 |
| commit | 30688dde55f637c9b984809c685b61378b82805f (patch) | |
| tree | f38c86463dc2b9dad0c3bb233dff2d429734ec00 /shlibs | |
| parent | build-sys: improve symlinks creation in shlibs/ (diff) | |
| download | kernel-qcow2-util-linux-30688dde55f637c9b984809c685b61378b82805f.tar.gz kernel-qcow2-util-linux-30688dde55f637c9b984809c685b61378b82805f.tar.xz kernel-qcow2-util-linux-30688dde55f637c9b984809c685b61378b82805f.zip | |
build-sys: rename to _execdir
The variable name "usrlibexecdir" is very confusing (because we have
/usr/libexec). The "exec" prefix is required for user-defined
directories, see
http://www.gnu.org/software/hello/manual/automake/The-Two-Parts-of-Install.html#The-Two-Parts-of-Install
This patch renames all usr*execdir variables to usr*_execdir.
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'shlibs')
| -rw-r--r-- | shlibs/blkid/Makefile.am | 2 | ||||
| -rw-r--r-- | shlibs/blkid/blkid.pc.in | 2 | ||||
| -rw-r--r-- | shlibs/blkid/src/Makefile.am | 14 | ||||
| -rw-r--r-- | shlibs/uuid/Makefile.am | 2 | ||||
| -rw-r--r-- | shlibs/uuid/src/Makefile.am | 14 | ||||
| -rw-r--r-- | shlibs/uuid/uuid.pc.in | 2 |
6 files changed, 18 insertions, 18 deletions
diff --git a/shlibs/blkid/Makefile.am b/shlibs/blkid/Makefile.am index 9c552bfde..a0a9de38e 100644 --- a/shlibs/blkid/Makefile.am +++ b/shlibs/blkid/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/config/include-Makefile.am SUBDIRS = src # pkg-config stuff -pkgconfigdir = $(usrlibexecdir)/pkgconfig +pkgconfigdir = $(usrlib_execdir)/pkgconfig pkgconfig_DATA = blkid.pc dist_man_MANS = libblkid.3 diff --git a/shlibs/blkid/blkid.pc.in b/shlibs/blkid/blkid.pc.in index f5debbbc9..40ec8a9d7 100644 --- a/shlibs/blkid/blkid.pc.in +++ b/shlibs/blkid/blkid.pc.in @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@usrlibexecdir@ +libdir=@usrlib_execdir@ includedir=@includedir@ Name: blkid diff --git a/shlibs/blkid/src/Makefile.am b/shlibs/blkid/src/Makefile.am index 8129d28c2..bd51dd98c 100644 --- a/shlibs/blkid/src/Makefile.am +++ b/shlibs/blkid/src/Makefile.am @@ -21,7 +21,7 @@ AM_CPPFLAGS += -I$(ul_libblkid_srcdir) $(common_cflags) blkidincdir = $(includedir)/blkid blkidinc_HEADERS = blkid.h -usrlibexec_LTLIBRARIES = libblkid.la +usrlib_exec_LTLIBRARIES = libblkid.la libblkid_la_SOURCES = cache.c dev.c devname.c devno.c getsize.c llseek.c \ probe.c read.c resolve.c save.c tag.c version.c verify.c \ encode.c blkid.h list.h blkidP.h probers/probers.h \ @@ -49,14 +49,14 @@ test_%: %.c $(COMPILE) -DTEST_PROGRAM $< .libs/libblkid.a -o $@ $(common_ldadd) -# move lib from $(usrlibexecdir) to $(libdir) if needed +# move lib from $(usrlib_execdir) to $(libdir) if needed install-exec-hook: - if test "$(usrlibexecdir)" != "$(libdir)"; then \ + if test "$(usrlib_execdir)" != "$(libdir)"; then \ mkdir -p $(DESTDIR)$(libdir); \ - mv $(DESTDIR)$(usrlibexecdir)/libblkid.so.* $(DESTDIR)$(libdir); \ - so_img_name=$$(readlink $(DESTDIR)$(usrlibexecdir)/libblkid.so); \ - so_img_rel_target=$$(echo $(usrlibexecdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ - (cd $(DESTDIR)$(usrlibexecdir) && \ + mv $(DESTDIR)$(usrlib_execdir)/libblkid.so.* $(DESTDIR)$(libdir); \ + so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libblkid.so); \ + so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ + (cd $(DESTDIR)$(usrlib_execdir) && \ rm -f libblkid.so && \ $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libblkid.so); \ fi diff --git a/shlibs/uuid/Makefile.am b/shlibs/uuid/Makefile.am index acd06e091..38ce18d8b 100644 --- a/shlibs/uuid/Makefile.am +++ b/shlibs/uuid/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/config/include-Makefile.am SUBDIRS = src man # pkg-config stuff -pkgconfigdir = $(usrlibexecdir)/pkgconfig +pkgconfigdir = $(usrlib_execdir)/pkgconfig pkgconfig_DATA = uuid.pc EXTRA_DIST = uuid.pc uuid.pc.in diff --git a/shlibs/uuid/src/Makefile.am b/shlibs/uuid/src/Makefile.am index 81aa18650..843328def 100644 --- a/shlibs/uuid/src/Makefile.am +++ b/shlibs/uuid/src/Makefile.am @@ -10,7 +10,7 @@ tst_uuid_CFLAGS = -I$(ul_libuuid_srcdir) uuidincdir = $(includedir)/uuid uuidinc_HEADERS = uuid.h -usrlibexec_LTLIBRARIES = libuuid.la +usrlib_exec_LTLIBRARIES = libuuid.la libuuid_la_SOURCES = clear.c compare.c copy.c gen_uuid.c \ isnull.c pack.c parse.c unpack.c unparse.c uuidd.h \ uuidd.h uuidP.h uuid_time.c $(uuidinc_HEADERS) @@ -30,14 +30,14 @@ test_%: %.c $(COMPILE) -DTEST_PROGRAM $< .libs/libuuid.a -o $@ -# move lib from $(usrlibexecdir) to $(libdir) if needed +# move lib from $(usrlib_execdir) to $(libdir) if needed install-exec-hook: - if test "$(usrlibexecdir)" != "$(libdir)"; then \ + if test "$(usrlib_execdir)" != "$(libdir)"; then \ mkdir -p $(DESTDIR)$(libdir); \ - mv $(DESTDIR)$(usrlibexecdir)/libuuid.so.* $(DESTDIR)$(libdir); \ - so_img_name=$$(readlink $(DESTDIR)$(usrlibexecdir)/libuuid.so); \ - so_img_rel_target=$$(echo $(usrlibexecdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ - (cd $(DESTDIR)$(usrlibexecdir) && \ + mv $(DESTDIR)$(usrlib_execdir)/libuuid.so.* $(DESTDIR)$(libdir); \ + so_img_name=$$(readlink $(DESTDIR)$(usrlib_execdir)/libuuid.so); \ + so_img_rel_target=$$(echo $(usrlib_execdir) | sed 's,\(^/\|\)[^/][^/]*,..,g'); \ + (cd $(DESTDIR)$(usrlib_execdir) && \ rm -f libuuid.so && \ $(LN_S) $$so_img_rel_target$(libdir)/$$so_img_name libuuid.so); \ fi diff --git a/shlibs/uuid/uuid.pc.in b/shlibs/uuid/uuid.pc.in index b51282a17..875de19bc 100644 --- a/shlibs/uuid/uuid.pc.in +++ b/shlibs/uuid/uuid.pc.in @@ -1,6 +1,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ -libdir=@usrlibexecdir@ +libdir=@usrlib_execdir@ includedir=@includedir@ Name: uuid |