From: Gary V. Vaughan <gary@gnu.org>
Date: Thu, 10 Mar 2005 16:40:19 +0000 (+0000)
Subject: * libltdl/Makefile.am (install-data-local): Don't force v7 tar
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2faf40154ad0b13e0a3ca3ccdd52464041c114c;p=thirdparty%2Flibtool.git

* 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
their mode from the installer's umask.
* libltdl/loaders/Makefile.am (install-data-local): Ditto.
* libtoolize.m4sh (func_copy_cb): Ditto.
Ignore errors from failed `cd' in the tar processes, since we
may be running in dryrun mode.
Reported by Noah Misch <noah@cs.caltech.edu>,
	Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
---

diff --git a/ChangeLog b/ChangeLog
index cf6e65f57..b0653f2ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2005-03-10  Gary V. Vaughan  <gary@gnu.org>
+
+	* 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
+	their mode from the installer's umask.
+	* libltdl/loaders/Makefile.am (install-data-local): Ditto.
+	* libtoolize.m4sh (func_copy_cb): Ditto.
+	Ignore errors from failed `cd' in the tar processes, since we
+	may be running in dryrun mode.
+	Reported by Noah Misch <noah@cs.caltech.edu>,
+		Bob Friesenhahn <bfriesen@simple.dallas.tx.us>
+
 2005-03-10  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* libltdl/Makefile.am: $(builddir) is not defined, replace by `.'.
diff --git a/libltdl/Makefile.am b/libltdl/Makefile.am
index 8ea403940..01697c045 100644
--- a/libltdl/Makefile.am
+++ b/libltdl/Makefile.am
@@ -67,7 +67,9 @@ libltdlc_la_LIBADD	= $(libltdl_la_LIBADD)
 ## These are installed as a subdirectory of pkgdatadir so that
 ## libtoolize --ltdl can find them later:
 ltdldatadir		= $(pkgdatadir)/libltdl
-ltdldatafiles		= COPYING.LIB Makefile.am README configure.ac \
+ltdldatafiles		= COPYING.LIB README \
+			  Makefile.am Makefile.in \
+			  configure.ac configure \
 			  $(libltdl_la_SOURCES) \
 			  lt__dirent.c libltdl/lt__dirent.h \
                           lt__strl.c libltdl/lt__strl.h \
@@ -77,8 +79,8 @@ ltdldatafiles		= COPYING.LIB Makefile.am README configure.ac \
 ## with libtoolize, we have to preserve their timestamps carefully:
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
-	( cd $(srcdir) && $(AMTAR) chof - $(ltdldatafiles); ) \
-	  | ( cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
+	( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \
+	  | ( 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 197df4583..9c609407c 100644
--- a/libltdl/loaders/Makefile.am
+++ b/libltdl/loaders/Makefile.am
@@ -47,12 +47,14 @@ dld_link_la_LIBADD	= -ldld
 ## These are installed as a subdirectory of pkgdatadir so that
 ## libtoolize --ltdl can find them later:
 ltdldatadir		= $(pkgdatadir)/libltdl/loaders
-ltdldatafiles		= Makefile.am dld_link.c dlopen.c dyld.c \
+ltdldatafiles		= Makefile.am Makefile.in \
+			  dld_link.c dlopen.c dyld.c \
 			  load_add_on.c loadlibrary.c shl_load.c
 
 ## To avoid spurious reconfiguration when the user installs these files
 ## with libtoolize, we have to preserve their timestamps carefully:
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(ltdldatadir)
-	( cd $(srcdir) && $(AMTAR) chof - $(ltdldatafiles); ) \
-	  | ( cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
+	( cd $(srcdir) && $(AMTAR) chf - $(ltdldatafiles); ) \
+	  | ( umask 0; cd $(DESTDIR)$(ltdldatadir) && $(AMTAR) xf -; )
+
diff --git a/libtoolize.m4sh b/libtoolize.m4sh
index f35cfd4a1..4ff822335 100644
--- a/libtoolize.m4sh
+++ b/libtoolize.m4sh
@@ -230,8 +230,9 @@ func_copy_cb ()
     if $opt_link && $LN_S "$my_srcdir/$my_file" "$my_destdir/$my_file"; then
       $opt_quiet || func_echo "copying file \`$my_destdir/$my_file'"
       copy_return_status=0
-    elif { ( cd "$my_srcdir" && $TAR chof - "$my_file" 2> /dev/null; ) \
-        | ( cd "$my_destdir" && "$TAR" xf - > /dev/null 2>&1; ) } ; then
+    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; ) }
+    then
       $opt_quiet || func_echo "copying file \`$my_destdir/$my_file'"
       copy_return_status=0
     elif $CP -p "$my_srcdir/$my_file" "$my_destdir/$my_file"; then