Merge changes between r19162 and r19234 from /fsf/trunk.

git-svn-id: svn://svn.eglibc.org/trunk@19235 7b3dc134-2b1b-0410-93df-9e9f96275f8d

1 files changed, 15 insertions, 2 deletions

diff --git a/libc/scripts/list-sources.sh b/libc/scripts/list-sources.sh
index 53b6f7f0e..528e971b4 100755
--- a/libc/scripts/list-sources.sh
+++ b/libc/scripts/list-sources.sh
@@ -11,8 +11,21 @@ esac
 
 if [ -r .git/HEAD ]; then
 
-  exec ${GIT:-git} ls-files
-
+  # List files for glibc core.
+  ${GIT:-git} ls-files
+  # List files for glibc ports.
+  ports="ports"
+  if [ -d "$PWD/$ports" ]; then
+    cd "$PWD/$ports"
+    ${GIT:-git} ls-files | sed -e "s,^,$ports/,g"
+  else
+    # We expect the glibc-ports directory to be symlinked as PORTS.
+    # The glibc release manager will run this script as part of libc.pot
+    # regeneration and should ensure the symlink to PORTS is setup.
+    echo >&2 "WARNING: No \"$ports\" directory found. Expected glibc-ports"\
+	     "source directory to be symlinked as \"$ports\" directory."
+  fi
+  exit 0
 fi
 
 echo >&2 'Cannot list sources without some version control system in use.'