From 212ed76081c595db4d3d0ae50a8ef9257d901bef Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Thu, 10 Mar 2005 20:58:06 +0000 Subject: [PATCH] * libltdl/Makefile.am (install-data-local): Use `&&' to separate commands so that stdin reaches the untar pracess. * libltdl/loaders/Makefile.am (install-data-local): Ditto. * libtoolize.m4sh (func_copy_cb): Ditto. --- ChangeLog | 5 +++++ libltdl/Makefile.am | 2 +- libltdl/loaders/Makefile.am | 2 +- libtoolize.m4sh | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0653f2ab..15cc9e210 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2005-03-10 Gary V. Vaughan + * libltdl/Makefile.am (install-data-local): Use `&&' to separate + commands so that stdin reaches the untar pracess. + * libltdl/loaders/Makefile.am (install-data-local): Ditto. + * libtoolize.m4sh (func_copy_cb): Ditto. + * libltdl/Makefile.am (install-data-local): Don't force v7 tar format with the `o' flag in create mode. Set the umask to 0 when untarring to avoid copied files taking diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am index 01697c045..3833d550a 100644 --- a/libltdl/Makefile.am +++ b/libltdl/Makefile.am @@ -80,7 +80,7 @@ ltdldatafiles = COPYING.LIB README \ install-data-local: $(mkinstalldirs) $(DESTDIR)$(ltdldatadir) ( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \ - | ( umask 0; cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; ) + | ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; ) ## Make sure these will be cleaned even when they're not built by default: CLEANFILES = libltdl.la libltdlc.la libdlloader.la diff --git a/libltdl/loaders/Makefile.am b/libltdl/loaders/Makefile.am index 9c609407c..dcacf885f 100644 --- a/libltdl/loaders/Makefile.am +++ b/libltdl/loaders/Makefile.am @@ -56,5 +56,5 @@ ltdldatafiles = Makefile.am Makefile.in \ install-data-local: $(mkinstalldirs) $(DESTDIR)$(ltdldatadir) ( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \ - | ( umask 0; cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; ) + | ( umask 0 && cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; ) diff --git a/libtoolize.m4sh b/libtoolize.m4sh index 4ff822335..f8ac5e073 100644 --- a/libtoolize.m4sh +++ b/libtoolize.m4sh @@ -231,7 +231,7 @@ func_copy_cb () $opt_quiet || func_echo "copying file \`$my_destdir/$my_file'" copy_return_status=0 elif { ( cd "$my_srcdir" 2>/dev/null && $TAR chf - "$my_file" 2> /dev/null; ) \ - | ( umask 0; cd "$my_destdir" 2>/dev/null && "$TAR" xf - > /dev/null 2>&1; ) } + | ( umask 0 && cd "$my_destdir" 2>/dev/null && "$TAR" xf - > /dev/null 2>&1; ) } then $opt_quiet || func_echo "copying file \`$my_destdir/$my_file'" copy_return_status=0 -- 2.47.2