Upgraded to 1.4-p6 + patches from Fedora Core 1

No longer make automake 1.4 the default automake Added docs using the new doc function
tgc · Mar 13, 2004 · f5af958 · f5af958
1 parent cd68986
commit f5af958
Show file tree

Hide file tree

Showing 6 changed files with 189 additions and 5 deletions.
diff --git a/automake14/build.sh b/automake14/build.sh
@@ -1,5 +1,5 @@
 #!/usr/local/bin/bash
-#
+
 # This is a generic build.sh script
 # It can be used nearly unmodified with many packages
 # 
@@ -8,11 +8,15 @@
 #
 # Check the following 4 variables before running the script
 topdir=automake14
-version=1.4-p5
-pkgver=3
+version=1.4-p6
+pkgver=4
 source[0]=automake-$version.tar.gz
 # If there are no patches, simply comment this
-#patch[0]=
+patch[0]=automake-1.4-libtoolize.patch
+patch[1]=automake-1.4-subdir.patch
+patch[2]=automake-1.4-backslash.patch
+patch[3]=automake-1.4-tags.patch
+patch[4]=automake-1.4-subdirs-89656.patch
 
 # Source function library
 . ${BUILDPKG_BASE}/scripts/buildpkg.functions
@@ -39,6 +43,7 @@ reg build
 build()
 {
     setdir source
+    autoreconf-2.57
     ./configure --prefix=/usr/local --disable-nls
     $MAKE_PROG
 }
@@ -47,7 +52,13 @@ reg install
 install()
 {
     generic_install DESTDIR
-    $RM -f $stagedir$prefix/info/dir
+    $RM -rf $stagedir$prefix/info
+    $RM -f $stagedir$prefix/bin/aclocal $stagedir$prefix/bin/automake
+    setdir source
+    $MKDIR -p info
+    $CP automake.info* info
+    $GZIP -9nf info/*
+    doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO info
 }
 
 reg pack

diff --git a/automake14/src/automake-1.4-backslash.patch b/automake14/src/automake-1.4-backslash.patch
@@ -0,0 +1,102 @@
+2001-04-10  H.J. Lu <[email protected]>
+
+	* automake.in (AM_EXEEXT): Fix a typo.
+	(quote_cond_val): Fix backslashes.
+	(unquote_cond_val): Fix backslashes.
+	(value_to_list): Fix backslashes.
+	(read_am_file): Fix backslashes.
+	(read_main_am_file): Fix backslashes.
+
+--- automake-1.4/automake.in.backsplash	Tue Apr 10 23:36:17 2001
++++ automake-1.4/automake.in	Tue Apr 10 23:36:19 2001
+@@ -279,7 +279,7 @@ $cygnus_mode = 0;
+      'fp_FUNC_FNMATCH', "use \`AC_FUNC_FNMATCH'",
+      'AM_SANITY_CHECK_CC', "automatically done by \`AC_PROG_CC'",
+      'AM_PROG_INSTALL', "use \`AC_PROG_INSTALL'",
+-     'AM_EXEEEXT', "use \`AC_EXEEXT'",
++     'AM_EXEEXT', "use \`AC_EXEEXT'",
+      'AM_CYGWIN32', "use \`AC_CYGWIN32'",
+      'AM_MINGW32', "use \`AC_MINGW32'",
+
+@@ -5196,8 +5196,7 @@ sub examine_variable
+ sub quote_cond_val
+ {
+     local ($val) = @_;
+-    $val =~ s/ /\001/g;
+-    $val =~ s/\t/\003/g;
++    $val =~ tr/ \t\n/\001\003\004/;
+     $val = "\002" if $val eq '';
+     return $val;
+ }
+@@ -5206,8 +5205,7 @@ sub quote_cond_val
+ sub unquote_cond_val
+ {
+     local ($val) = @_;
+-    $val =~ s/\001/ /g;
+-    $val =~ s/\003/\t/g;
++    $val =~ tr/\001\003\004/ \t\n/;
+     $val =~ s/\002//g;
+     return $val;
+ }
+@@ -5514,6 +5512,9 @@ sub value_to_list
+     local ($var, $val, $cond) = @_;
+     local (@result);
+
++    # Strip backslashes
++    $val =~ s/\\(\n|$)/ /g;
++
+     foreach (split (' ', $val))
+     {
+ 	# If a comment seen, just leave.
+@@ -5820,10 +5821,6 @@ sub read_am_file
+ 	    else
+ 	    {
+ 		$saw_bk = /\\$/;
+-		# Chop newline and backslash if this line is
+-		# continued.  ensure trailing whitespace exists.
+-		chop if $saw_bk;
+-		chop if $saw_bk;
+ 		$contents{$last_var_name} .= ' '
+ 		    unless $contents{$last_var_name} =~ /\s$/;
+ 		$contents{$last_var_name} .= $_;
+@@ -5934,7 +5931,7 @@ sub read_am_file
+ 	    local ($value);
+ 	    if ($3 ne '' && substr ($3, -1) eq "\\")
+ 	    {
+-		$value = substr ($3, 0, length ($3) - 1);
++		$value = $3 . "\n";
+ 	    }
+ 	    else
+ 	    {
+@@ -5948,6 +5945,12 @@ sub read_am_file
+ 		{
+ 		    $contents{$last_var_name} = '@' . $last_var_name . '@';
+ 		}
++		if (substr ($contents{$last_var_name}, -1) eq "\n")
++		{
++		    # Insert a backslash before a trailing newline.
++		    $contents{$last_var_name}
++			= substr ($contents{$last_var_name}, 0, -1) . "\\\n";
++		}
+ 		$contents{$last_var_name} .= ' ' . $value;
+ 	    }
+ 	    else
+@@ -6150,9 +6153,15 @@ sub read_main_am_file
+ 	    {
+ 		local ($vcond) = shift (@cond_vals);
+ 		local ($val) = &unquote_cond_val (shift (@cond_vals));
+-		$output_vars .= ($vcond . $curs
+-				 . ' ' . $def_type{$curs} . '= '
+-				 . $val . "\n");
++		$output_vars .= ($vcond . $curs . ' '
++				 . $def_type{$curs} . "= ");
++		local ($line);
++		foreach $line (split ("\n", $val))
++		{
++		    $output_vars .= $vcond . $line . "\n";
++		}
++		$output_vars .= "\n"
++		    if $val eq '';
+ 	    }
+ 	}
+ 	else
diff --git a/automake14/src/automake-1.4-libtoolize.patch b/automake14/src/automake-1.4-libtoolize.patch
@@ -0,0 +1,15 @@
+--- automake-1.4-p6/automake.in	Wed Jul 12 11:40:03 2000
++++ automake-1.4-p6/automake.in	Thu Nov  9 07:04:46 2000
+@@ -6882,9 +6882,11 @@
+ 		    $suppress = 1;
+
+ 		    # Maybe run libtoolize.
++		    @libtoolize_args = ('--automake');
++		    push @libtoolize_args, '-c'  if $copy_missing;
+ 		    if ($seen_libtool
+ 			&& grep ($_ eq $file, @libtoolize_files)
+-			&& system ('libtoolize', '--automake'))
++			&& system ('libtoolize', @libtoolize_args))
+ 		    {
+ 			$message = "installing \`$errfile'";
+ 			$suppress = 0;
diff --git a/automake14/src/automake-1.4-subdir.patch b/automake14/src/automake-1.4-subdir.patch
@@ -0,0 +1,22 @@
+2001-04-07  H.J. Lu <[email protected]>
+
+	* automake.in (handle_single_transform_list): Don't warn source
+	in subdirectory.
+
+--- automake-1.4/automake.in.ylwrap	Sat Apr  7 23:04:45 2001
++++ automake-1.4/automake.in	Sat Apr  7 23:17:32 2001
+@@ -1072,9 +1072,11 @@ sub handle_single_transform_list
+ 	    # the directory.  Later.
+ 	    if (/\//)
+ 	    {
+-		&am_error
+-		    ("not supported: source file `$_' is in subdirectory");
+-		next;
++		# It breaks gas/Makefile.in in binutils. For now, we
++		# turn off this warning.
++		# &am_error
++		# ("not supported: source file `$_' is in subdirectory");
++		# next;
+ 	    }
+
+ 	    # Split file name into base and extension.
diff --git a/automake14/src/automake-1.4-subdirs-89656.patch b/automake14/src/automake-1.4-subdirs-89656.patch
@@ -0,0 +1,20 @@
+--- automake-1.4-p6/subdirs.am.subdirs	2001-07-16 22:47:36.000000000 -0700
++++ automake-1.4-p6/subdirs.am	2003-04-25 08:24:35.000000000 -0700
+@@ -27,7 +27,7 @@
+ all-recursive install-data-recursive install-exec-recursive \
+ installdirs-recursive install-recursive uninstall-recursive @INSTALLINFO@ \
+ check-recursive installcheck-recursive info-recursive dvi-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+ 	target=`echo $@ | sed s/-recursive//`; \
+ 	list='$(SUBDIRS)'; for subdir in $$list; do \
+@@ -55,7 +55,7 @@ check-recursive installcheck-recursive i
+ ## bombs.
+ mostlyclean-recursive clean-recursive distclean-recursive \
+ maintainer-clean-recursive:
+-	@set fnord $(MAKEFLAGS); amf=$$2; \
++	@set fnord $$MAKEFLAGS; amf=$$2; \
+ 	dot_seen=no; \
+ 	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
+ 	  rev="$$subdir $$rev"; \
diff --git a/automake14/src/automake-1.4-tags.patch b/automake14/src/automake-1.4-tags.patch
@@ -0,0 +1,14 @@
+diff -u automake-1.4-p6/Makefile.am~ automake-1.4-p6/Makefile.am
+--- automake-1.4-p6/Makefile.am~	2002-07-29 21:10:39.000000000 +0900
++++ automake-1.4-p6/Makefile.am	2002-07-29 21:10:39.000000000 +0900
+@@ -151,8 +151,8 @@
+
+ ## Just get the .am files into TAGS.  We don't really care too much if
+ ## any interesting tags show up.
+-ETAGS_ARGS = $(amfiles)
+-TAGS_DEPENDENCIES = $(ETAGS_ARGS)
++#ETAGS_ARGS = $(amfiles)
++#TAGS_DEPENDENCIES = $(ETAGS_ARGS)
+
+ ## A temporary hack for the release.
+ DISTCLEANFILES = automake.cm automake.ov