summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys-utils/Makemodule.am3
-rwxr-xr-xtests/ts/rename/subdir4
2 files changed, 4 insertions, 3 deletions
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 4741fed02..ca47df80b 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -253,8 +253,7 @@ dist_man_MANS += \
swapon_SOURCES = \
sys-utils/swapon.c \
- sys-utils/swapon-common.c \
- sys-utils/swapon-common.h
+ sys-utils/swapon-common.c
swapon_CFLAGS = $(AM_CFLAGS) \
-I$(ul_libblkid_incdir) \
-I$(ul_libmount_incdir) \
diff --git a/tests/ts/rename/subdir b/tests/ts/rename/subdir
index f83b2bf10..4ae7005a7 100755
--- a/tests/ts/rename/subdir
+++ b/tests/ts/rename/subdir
@@ -35,7 +35,9 @@ for i in rename_a{a,b}/sublink.{1..3}; do
ln -s rename/aa $i
done
$TS_CMD_RENAME -s -v a x rename_a{a,b}/sublink.? >> $TS_OUTPUT 2>&1
-readlink rename_a{a,b}/sublink.? >> $TS_OUTPUT 2>&1
+for i in rename_a{a,b}/sublink.?; do
+ readlink $i >> $TS_OUTPUT 2>&1
+done
rm -rf rename_a{a,b}