From: Karel Zak <kzak@redhat.com>
Date: Fri, 3 Jul 2009 23:18:01 +0000 (+0200)
Subject: build-sys: rename to _execdir
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=30688dde55f637c9b984809c685b61378b82805f;p=util-linux

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>
---

diff --git a/configure.ac b/configure.ac
index ea9dbc3b..efbea2b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,14 +50,14 @@ esac
 AC_SUBST([libdirname])
 
 # The original default values of {bin,sbin,lib}dir
-usrbinexecdir='${exec_prefix}/bin'
-AC_SUBST([usrbinexecdir])
+usrbin_execdir='${_exec_prefix}/bin'
+AC_SUBST([usrbin_execdir])
 
-usrsbinexecdir='${exec_prefix}/sbin'
-AC_SUBST([usrsbinexecdir])
+usrsbin_execdir='${_exec_prefix}/sbin'
+AC_SUBST([usrsbin_execdir])
 
-usrlibexecdir='${exec_prefix}/'$libdirname
-AC_SUBST([usrlibexecdir])
+usrlib_execdir='${_exec_prefix}/'$libdirname
+AC_SUBST([usrlib_execdir])
 
 
 AC_PROG_CC_STDC
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 60481ab7..6bd22bc5 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -17,13 +17,13 @@ mkswap_SOURCES = mkswap.c $(utils_common) ../lib/wholedisk.c ../lib/pttype.c
 mkswap_LDADD =
 mkswap_CFLAGS =
 
-usrbinexec_PROGRAMS = isosize
-usrsbinexec_PROGRAMS =
+usrbin_exec_PROGRAMS = isosize
+usrsbin_exec_PROGRAMS =
 
 if LINUX
 dist_man_MANS += fdformat.8 blockdev.8
 sbin_PROGRAMS += blockdev
-usrsbinexec_PROGRAMS += fdformat
+usrsbin_exec_PROGRAMS += fdformat
 blockdev_SOURCES = blockdev.c $(utils_common)
 endif
 
diff --git a/getopt/Makefile.am b/getopt/Makefile.am
index 58ae7fc3..bd3e7942 100644
--- a/getopt/Makefile.am
+++ b/getopt/Makefile.am
@@ -1,6 +1,6 @@
 include $(top_srcdir)/config/include-Makefile.am
 
-usrbinexec_PROGRAMS = getopt
+usrbin_exec_PROGRAMS = getopt
 dist_man_MANS = getopt.1
 
 exampledir = $(datadir)/getopt/
diff --git a/login-utils/Makefile.am b/login-utils/Makefile.am
index d91a5eb7..177c0b63 100644
--- a/login-utils/Makefile.am
+++ b/login-utils/Makefile.am
@@ -1,9 +1,9 @@
 include $(top_srcdir)/config/include-Makefile.am
 
 bin_PROGRAMS =
-usrbinexec_PROGRAMS =
+usrbin_exec_PROGRAMS =
 sbin_PROGRAMS =
-usrsbinexec_PROGRAMS =
+usrsbin_exec_PROGRAMS =
 dist_man_MANS =
 
 EXTRA_DIST = README.getty  README.modems-with-agetty  README.poeigl
@@ -29,15 +29,15 @@ endif
 endif
 
 if BUILD_LAST
-usrbinexec_PROGRAMS += last
+usrbin_exec_PROGRAMS += last
 dist_man_MANS += last.1
 endif
 
 if BUILD_LOGIN_UTILS
 
 bin_PROGRAMS += login
-usrbinexec_PROGRAMS += chfn chsh newgrp
-usrsbinexec_PROGRAMS += vipw
+usrbin_exec_PROGRAMS += chfn chsh newgrp
+usrsbin_exec_PROGRAMS += vipw
 dist_man_MANS += chfn.1 chsh.1 login.1 newgrp.1 vipw.8 vigr.8
 
 chfn_SOURCES = chfn.c $(chfn_chsh_common)
@@ -91,25 +91,25 @@ endif
 
 
 install-exec-hook::
-	cd $(DESTDIR)$(usrsbinexecdir) && ln -sf vipw vigr
+	cd $(DESTDIR)$(usrsbin_execdir) && ln -sf vipw vigr
 
 endif
 
 if BUILD_MESG
-usrbinexec_PROGRAMS += mesg
+usrbin_exec_PROGRAMS += mesg
 dist_man_MANS += mesg.1
 endif
 
 if BUILD_WALL
-usrbinexec_PROGRAMS += wall
+usrbin_exec_PROGRAMS += wall
 wall_SOURCES = wall.c ttymsg.c ttymsg.h
 dist_man_MANS += wall.1
 
 if USE_TTY_GROUP
 if MAKEINSTALL_DO_CHOWN
 install-exec-hook::
-	chgrp tty $(DESTDIR)$(usrbinexecdir)/wall
-	chmod g+s $(DESTDIR)$(usrbinexecdir)/wall
+	chgrp tty $(DESTDIR)$(usrbin_execdir)/wall
+	chmod g+s $(DESTDIR)$(usrbin_execdir)/wall
 endif
 endif
 endif
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am
index 7c4561c4..a4f2f44e 100644
--- a/misc-utils/Makefile.am
+++ b/misc-utils/Makefile.am
@@ -4,15 +4,15 @@ EXTRA_DIST = README.flushb uuidd.rc
 
 bin_PROGRAMS =
 sbin_PROGRAMS =
-usrsbinexec_PROGRAMS =
+usrsbin_exec_PROGRAMS =
 
-usrbinexec_PROGRAMS = cal ddate logger look mcookie \
+usrbin_exec_PROGRAMS = cal ddate logger look mcookie \
 	namei script whereis scriptreplay
 EXTRA_DIST += README.cal README.ddate README.namei README.namei2
 
 mcookie_SOURCES = mcookie.c ../lib/md5.c
 
-usrbinexec_SCRIPTS = chkdupexe
+usrbin_exec_SCRIPTS = chkdupexe
 
 CLEANFILES = chkdupexe
 
@@ -20,12 +20,12 @@ dist_man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \
 	namei.1 script.1 whereis.1 scriptreplay.1
 
 if BUILD_LIBUUID
-usrbinexec_PROGRAMS += uuidgen
+usrbin_exec_PROGRAMS += uuidgen
 dist_man_MANS += uuidgen.1
 uuidgen_LDADD = $(ul_libuuid_la)
 uuidgen_CFLAGS = -I$(ul_libuuid_srcdir)
 if BUILD_UUIDD
-usrsbinexec_PROGRAMS += uuidd
+usrsbin_exec_PROGRAMS += uuidd
 dist_man_MANS += uuidd.8
 uuidd_LDADD = $(ul_libuuid_la)
 uuidd_CFLAGS = -I$(ul_libuuid_srcdir)
@@ -66,7 +66,7 @@ endif
 
 if HAVE_NCURSES
 if LINUX
-usrbinexec_PROGRAMS += setterm
+usrbin_exec_PROGRAMS += setterm
 dist_man_MANS += setterm.1
 endif
 if HAVE_TINFO
@@ -83,18 +83,18 @@ dist_man_MANS += kill.1
 endif
 
 if BUILD_RENAME
-usrbinexec_PROGRAMS += rename
+usrbin_exec_PROGRAMS += rename
 dist_man_MANS += rename.1
 endif
 
 if BUILD_RESET
-dist_usrbinexec_SCRIPTS = reset
+dist_usrbin_exec_SCRIPTS = reset
 dist_man_MANS += reset.1
 endif
 EXTRA_DIST += README.reset reset.033c
 
 if BUILD_WRITE
-usrbinexec_PROGRAMS += write
+usrbin_exec_PROGRAMS += write
 dist_man_MANS += write.1
 write_CFLAGS = $(SUID_CFLAGS) $(AM_CFLAGS)
 write_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
@@ -102,8 +102,8 @@ write_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS)
 if USE_TTY_GROUP
 if MAKEINSTALL_DO_CHOWN
 install-exec-hook::
-	chgrp tty $(DESTDIR)$(usrbinexecdir)/write
-	chmod g+s $(DESTDIR)$(usrbinexecdir)/write
+	chgrp tty $(DESTDIR)$(usrbin_execdir)/write
+	chmod g+s $(DESTDIR)$(usrbin_execdir)/write
 endif
 endif
 endif
diff --git a/partx/Makefile.am b/partx/Makefile.am
index 5fc5db6c..238f3228 100644
--- a/partx/Makefile.am
+++ b/partx/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/include-Makefile.am
 
 if BUILD_PARTX
 
-usrsbinexec_PROGRAMS = addpart delpart partx
+usrsbin_exec_PROGRAMS = addpart delpart partx
 partx_SOURCES = bsd.c dos.c partx.c solaris.c unixware.c gpt.c crc32.c \
 		efi.h gpt.h crc32.h partx.h dos.h ../lib/blkdev.c
 
diff --git a/schedutils/Makefile.am b/schedutils/Makefile.am
index 0c14e51a..88439f2b 100644
--- a/schedutils/Makefile.am
+++ b/schedutils/Makefile.am
@@ -2,18 +2,18 @@ include $(top_srcdir)/config/include-Makefile.am
 
 if BUILD_SCHEDUTILS
 
-usrbinexec_PROGRAMS = chrt
+usrbin_exec_PROGRAMS = chrt
 dist_man_MANS = chrt.1
 
 if HAVE_IOPRIO_GET
 if HAVE_IOPRIO_SET
-usrbinexec_PROGRAMS += ionice
+usrbin_exec_PROGRAMS += ionice
 dist_man_MANS += ionice.1
 endif
 endif
 
 if HAVE_SCHED_GETAFFINITY
-usrbinexec_PROGRAMS += taskset
+usrbin_exec_PROGRAMS += taskset
 dist_man_MANS += taskset.1
 endif
 
diff --git a/shlibs/blkid/Makefile.am b/shlibs/blkid/Makefile.am
index 9c552bfd..a0a9de38 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 f5debbbc..40ec8a9d 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 8129d28c..bd51dd98 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 acd06e09..38ce18d8 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 81aa1865..843328de 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 b51282a1..875de19b 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
diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am
index 27f85b8d..19ecccca 100644
--- a/sys-utils/Makefile.am
+++ b/sys-utils/Makefile.am
@@ -2,8 +2,8 @@ include $(top_srcdir)/config/include-Makefile.am
 
 bin_PROGRAMS =
 sbin_PROGRAMS =
-usrbinexec_PROGRAMS = flock ipcrm ipcs ipcmk renice setsid
-usrsbinexec_PROGRAMS = readprofile
+usrbin_exec_PROGRAMS = flock ipcrm ipcs ipcmk renice setsid
+usrsbin_exec_PROGRAMS = readprofile
 
 dist_man_MANS = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 setsid.1 \
 		readprofile.1
@@ -11,8 +11,8 @@ dist_man_MANS = flock.1 ipcrm.1 ipcs.1 ipcmk.1 renice.1 setsid.1 \
 if LINUX
 bin_PROGRAMS += dmesg
 sbin_PROGRAMS += ctrlaltdel
-usrbinexec_PROGRAMS += cytune setarch lscpu
-usrsbinexec_PROGRAMS += ldattach tunelp rtcwake
+usrbin_exec_PROGRAMS += cytune setarch lscpu
+usrsbin_exec_PROGRAMS += ldattach tunelp rtcwake
 
 dist_man_MANS += dmesg.1 ctrlaltdel.8 cytune.8 setarch.8 \
 		ldattach.8 lscpu.1 tunelp.8 rtcwake.8
@@ -40,7 +40,7 @@ endif
 
 RDEV_LINKS =
 if BUILD_RDEV
-usrsbinexec_PROGRAMS += rdev
+usrsbin_exec_PROGRAMS += rdev
 RDEV_LINKS += ramsize vidmode rootflags
 dist_man_MANS += rdev.8
 endif
@@ -85,17 +85,17 @@ $(SETARCH_MAN_LINKS): setarch.8
 
 install-exec-hook:
 	for I in $(RDEV_LINKS); do \
-		cd $(DESTDIR)$(usrsbinexecdir) && ln -sf rdev $$I ; \
+		cd $(DESTDIR)$(usrsbin_execdir) && ln -sf rdev $$I ; \
 	done
 	for I in $(SETARCH_LINKS); do \
-		cd $(DESTDIR)$(usrbinexecdir) && ln -sf setarch $$I ; \
+		cd $(DESTDIR)$(usrbin_execdir) && ln -sf setarch $$I ; \
 	done
 
 uninstall-hook:
 	for I in $(RDEV_LINKS); do \
-		rm -f $(DESTDIR)$(usrbinexecdir)/$$I ; \
+		rm -f $(DESTDIR)$(usrbin_execdir)/$$I ; \
 	done
 	for I in $(SETARCH_LINKS); do \
-		rm -f $(DESTDIR)$(usrbinexecdir)/$$I ; \
+		rm -f $(DESTDIR)$(usrbin_execdir)/$$I ; \
 	done
 
diff --git a/text-utils/Makefile.am b/text-utils/Makefile.am
index 7c724aeb..dec895b4 100644
--- a/text-utils/Makefile.am
+++ b/text-utils/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/include-Makefile.am
 
 EXTRA_DIST = README.clear README.col
 
-usrbinexec_PROGRAMS = col colcrt colrm column hexdump rev line tailf
+usrbin_exec_PROGRAMS = col colcrt colrm column hexdump rev line tailf
 
 hexdump_SOURCES = hexdump.c conv.c display.c hexsyntax.c odsyntax.c parse.c \
 		  hexdump.h
@@ -11,7 +11,7 @@ dist_man_MANS = col.1 colcrt.1 colrm.1 column.1 hexdump.1 rev.1 line.1 tailf.1
 
 if HAVE_NCURSES
 bin_PROGRAMS = more
-usrbinexec_PROGRAMS += ul pg
+usrbin_exec_PROGRAMS += ul pg
 if HAVE_TINFO
 more_LDADD = -ltinfo
 pg_LDADD = -ltinfo @NCURSES_LIBS@