X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;ds=sidebyside;f=bootstrap;h=affe7a9a324a0802eb445c343669c5c2dca77f95;hb=13aead50a8cb8b20532a4eb26dd84cde52970806;hp=8b5709d4a9b96fcdfe5d8823731b5692034fed3d;hpb=cfe4eef5c244cd854190abd57a4a457ff3abe38d;p=chaz%2Ftar diff --git a/bootstrap b/bootstrap index 8b5709d..affe7a9 100755 --- a/bootstrap +++ b/bootstrap @@ -16,8 +16,8 @@ # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -# 02111-1307, USA. +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. # Written by Paul Eggert and Sergey Poznyakoff. @@ -191,8 +191,15 @@ copy_files() { case $file in "#*") continue;; esac - echo "$0: Copying file $1/$file" - cp -p $1/$file $2/`expr $file : '.*/\(.*\)'` + dst=`echo $file | sed 's^.*/^^'` + if [ $# -eq 3 ]; then + case $dst in + ${3}*) ;; + *) dst=${3}$dst;; + esac + fi + echo "$0: Copying file $1/$file to $2/$dst" + cp -p $1/$file $2/$dst done } @@ -215,6 +222,8 @@ do copy_files ${PAXUTILS_SRCDIR}/$dir $dir done +copy_files ${PAXUTILS_SRCDIR}/paxlib lib pax + # Get gnulib files. case ${GNULIB_SRCDIR--} in