From 980c4d04493807bbc52b84cd0cf04b5c0338bc6d Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 2 Nov 2001 02:08:57 +0000
Subject: [PATCH] Update.

	* sunrpc/Makefile (rpcgen-cmd): Use ../scripts/cpp in rpcgen calls.
	* scripts/cpp: New file.
---
 ChangeLog       |  3 +++
 scripts/cpp     | 21 +++++++++++++++++++++
 sunrpc/Makefile |  3 +--
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100755 scripts/cpp

diff --git a/ChangeLog b/ChangeLog
index f38bfa2..2540cbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2001-11-01  Ulrich Drepper  <drepper@redhat.com>
 
+	* sunrpc/Makefile (rpcgen-cmd): Use ../scripts/cpp in rpcgen calls.
+	* scripts/cpp: New file.
+
 	* elf/dl-load.c (_dl_map_object): Correct test of DF_1_NODEFLIB
 	for rtld_search_dirs content.  Minor optimizations.
 
diff --git a/scripts/cpp b/scripts/cpp
new file mode 100755
index 0000000..4a62f1e
--- /dev/null
+++ b/scripts/cpp
@@ -0,0 +1,21 @@
+#! /bin/sh
+cpp=`which cpp 2>/dev/null`
+if test $? -ne 0; then
+  cpp=`type cpp 2>/dev/null | awk '{ print $NF }'`
+  if test $? -ne 0; then
+    cpp=`gcc -print-file-name=cpp 2>/dev/null`
+    if test $? -ne 0; then
+      if test -x /lib/cpp; then
+        cpp=/lib/cpp
+      else
+        echo "cpp not found" 1>&2
+        exit 1
+      fi
+    fi
+  fi
+fi
+
+exec $cpp $*
+Local Variables:
+mode: sh
+End:
diff --git a/sunrpc/Makefile b/sunrpc/Makefile
index c1bf945..b7858d6 100644
--- a/sunrpc/Makefile
+++ b/sunrpc/Makefile
@@ -126,8 +126,7 @@ $(objpfx)rpcgen: $(addprefix $(objpfx),$(rpcgen-objs)) \
 	$(+link)
 
 # Tell rpcgen where to find the C preprocessor.
-rpcgen-cmd = $(built-program-cmd) -Y `$(CC) -print-file-name=cpp | \
-				      sed 's|/cpp$$||'`
+rpcgen-cmd = $(built-program-cmd) -Y ../scripts
 
 # Install the rpc data base file.
 $(inst_sysconfdir)/rpc: etc.rpc $(+force)
-- 
2.7.4