--- plamo/00_base/old/shadow-20170430/PlamoBuild.shadow-git_20130908	2017-04-30 17:46:49.000000000 +0900
+++ plamo/00_base/shadow/PlamoBuild.shadow-git_20130908	2017-06-24 14:34:20.000000000 +0900
@@ -39,17 +39,17 @@
   done
   apply_patches
   cd $B
-  cp -p etc/pam.d/chfn etc/pam.d/chfn.orig
+  cp -p etc/pam.d/chfn{,.orig}
   cat <<- "EOF" | patch etc/pam.d/chfn
 	2a3
 	> auth		include		system-auth
 	EOF
-  cp -p etc/pam.d/chsh etc/pam.d/chsh.orig
+  cp -p etc/pam.d/chsh{,.orig}
   cat <<- "EOF" | patch etc/pam.d/chsh
 	2a3
 	> auth		include		system-auth
 	EOF
-  cp -p etc/pam.d/login etc/pam.d/login.orig
+  cp -p etc/pam.d/login{,.orig}
   cat <<- "EOF" | patch etc/pam.d/login
 	7c7
 	< session		required	pam_selinux.so close
@@ -64,7 +64,7 @@
 	> session		required	pam_lastlog.so
 	> session		optional	pam_ck_connector.so nox11
 	EOF
-  cp -p etc/pam.d/su etc/pam.d/su.orig
+  cp -p etc/pam.d/su{,.orig}
   cat <<- "EOF" | patch etc/pam.d/su
 	6c6
 	< auth		required	pam_wheel.so use_uid
@@ -79,15 +79,15 @@
 	---
 	> #session		required	pam_selinux.so open multiple
 	EOF
-  cp -p etc/pam.d/chage etc/pam.d/chage.orig
+  cp -p etc/pam.d/chage{,.orig}
   cat <<- "EOF" | patch etc/pam.d/chage
 	2a3
 	> auth		include		system-auth
 	EOF
-  cp -p etc/useradd etc/useradd.orig
+  cp -p etc/useradd{,.orig}
   sed '/^GROUP=/s@1000@100@g' etc/useradd.orig \
       | sed '/^CREATE_MAIL_SPOOL=/s@yes@no@g' > etc/useradd
-  cp -p etc/login.defs etc/login.defs.orig
+  cp -p etc/login.defs{,.orig}
   cat <<- "EOF" | patch etc/login.defs
 	17c17
 	< FAILLOG_ENAB		yes
@@ -231,13 +231,13 @@
   tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/locale -name *.mo`
   for loc in cs da de fi fr hu id it ja_JP.eucJP ko pl pt_BR ru sv tr \
       zh_CN zh_TW ; do
-    [ -d $P/usr/share/man/$loc/man1 ] && tar rvpf $pkg.tar -C $P \
+    [ -d $mandir/$loc/man1 ] && tar rvpf $pkg.tar -C $P \
         `cd $P ; find usr/share/man/$loc/man1 | tail -n+2`
-    [ -d $P/usr/share/man/$loc/man3 ] && tar rvpf $pkg.tar -C $P \
+    [ -d $mandir/$loc/man3 ] && tar rvpf $pkg.tar -C $P \
         `cd $P ; find usr/share/man/$loc/man3 | tail -n+2`
-    [ -d $P/usr/share/man/$loc/man5 ] && tar rvpf $pkg.tar -C $P \
+    [ -d $mandir/$loc/man5 ] && tar rvpf $pkg.tar -C $P \
         `cd $P ; find usr/share/man/$loc/man5 | tail -n+2`
-    [ -d $P/usr/share/man/$loc/man8 ] && tar rvpf $pkg.tar -C $P \
+    [ -d $mandir/$loc/man8 ] && tar rvpf $pkg.tar -C $P \
         `cd $P ; find usr/share/man/$loc/man8 | tail -n+2`
   done
   tar rvpf $pkg.tar -C $P `cd $P ; find usr/share/man/man1 | tail -n+2`