- sparc-sun-solaris2.6 portability check.

CVS patchset: 3589
CVS date: 2000/02/25 16:49:05

2 files changed, 19 insertions, 13 deletions

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 4c3166d01..2aabf18d1 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
+# Makefile.in generated automatically by automake 1.4a from Makefile.am
 
 # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
@@ -48,9 +48,10 @@ AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_FLAG =
 transform = @program_transform_name@
 
 NORMAL_INSTALL = :
@@ -171,7 +172,7 @@ DIST_COMMON =  Makefile.am Makefile.in brp-redhat.in
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = gtar
+TAR = tar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -220,7 +221,7 @@ distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
+	    cp -pr $$d/$$file $(distdir)/$$file; \
 	  else \
 	    test -f $(distdir)/$$file \
 	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
@@ -249,7 +250,7 @@ uninstall: uninstall-am
 all-am: Makefile $(SCRIPTS)
 all-redirect: all-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install
 installdirs:
 	$(mkinstalldirs)  $(DESTDIR)$(configdir)
 
diff --git a/scripts/vpkg-provides.sh b/scripts/vpkg-provides.sh
index 1ca58dc67..0acc56e13 100755
--- a/scripts/vpkg-provides.sh
+++ b/scripts/vpkg-provides.sh
@@ -182,6 +182,8 @@ do
 		echo "$0: Unrecognized option: \"$orig_option\"; use --help for usage." >&2
 		exit 1
 		;;
+	esac
+done
 
 
 # consistancy checks on the arguments
@@ -247,23 +249,25 @@ cat $spec_header
 #
 # Output the shared libraries
 #
-for f in `cat $provides_tmp | sort -u`
-do
+{
+    for f in `cat $provides_tmp | sort -u`
+    do
 	echo "Provides: $f"
-done
+    done
 
 #
 # Output the available shell interpreters
 #
-for d in `echo $interp_dirs | sed -e 's/:/ /g'`
-do
+    for d in `echo $interp_dirs | sed -e 's/:/ /g'`
+    do
 	for f in `echo $interps | sed -e 's/:/ /g'`
 	do
 		if test -f $d/$f ; then
 			echo "Provides: $d/$f"
 		fi
 	done
-done
+    done
+} | sed -e 's/%/%%/g'
 
 #
 # Output the discription of the spec file
@@ -330,7 +334,7 @@ _EIEIO_
 # the contents of the temporary file are hardcoded into the verify
 # script so that the file can be reproduced at verification time.
 
-cat $sum_tmp
+cat $sum_tmp | sed -e 's/%/%%/g'
 
 cat <<_EIEIO_
 _EOF_
@@ -339,7 +343,7 @@ _EOF_
 cmp \$sum_package_tmp \$sum_current_tmp 
 
 if [ $? -ne 0 ]; then
-	echo"Differences found by: cmp \$sum_package_tmp \$sum_current_tmp"
+	echo "Differences found by: cmp \$sum_package_tmp \$sum_current_tmp"
 	exit \$?
 fi
 
@@ -350,3 +354,4 @@ _EIEIO_
 #
 
 echo '%files'
+echo '# no files in a virtual package'