[PATCH] cvs fixes for non-gnu platforms

[David Champion]

Werner [et al.] -

I made a couple of changes for scripts/autogen.sh and doc/Makefile.am
not to assume GNU behavior,

$< is unreliable in explicit rules under Solaris's (and probably other)
makes. Trivial change in doc/Makefile.am.

scripts/autogen.sh uses ksh/bash $() stdout substitution. Not supported
by strict /bin/sh.

scripts/autogen.sh's gettext check assumes gawk.

scripts/autogen.sh assumes GNU gettext is installed parallel to
automake. Small patch to try to locate gettext independently and pass
that directory to aclocal.


I also had to install automake's depcomp script into scripts/depcomp --
should this be in the CVS, or do you copy that as part of the release
process?

Patch attached against today's CVS.

-- 
 -D.	dgc at uchicago.edu	NSIT	University of Chicago
-------------- next part --------------
Index: doc/Makefile.am
===================================================================
RCS file: /cvs/gnupg/gnupg/doc/Makefile.am,v
retrieving revision 1.10.2.8
diff -u -r1.10.2.8 Makefile.am
--- doc/Makefile.am	2001/04/17 16:20:17	1.10.2.8
+++ doc/Makefile.am	2001/12/14 18:03:00
@@ -70,7 +70,7 @@
 	$(FAQPROG) -f $<  $@ || $(FAQPROG) -f $< $@
 
 faq.html : faq.raw
-	$(FAQPROG) -h -f $< $@ 2>&1 || $(FAQPROG) -h -f $< $@
+	$(FAQPROG) -h -f faq.raw $@ 2>&1 || $(FAQPROG) -h -f faq.raw $@
 
 dist-hook:
 	@if test `wc -c < gpg.1` -lt 200; then \
Index: scripts/autogen.sh
===================================================================
RCS file: /cvs/gnupg/gnupg/scripts/autogen.sh,v
retrieving revision 1.11.2.9
diff -u -r1.11.2.9 autogen.sh
--- scripts/autogen.sh	2001/10/23 08:04:00	1.11.2.9
+++ scripts/autogen.sh	2001/12/14 18:03:00
@@ -20,7 +20,8 @@
 
 DIE=no
 if test "$1" = "--build-w32"; then
-    tsdir=$(cd `dirname $0`; cd ..; pwd)
+    tmp=`dirname $0`
+    tsdir=`cd "$tmp"; cd ..; pwd`
     shift
     host=i386--mingw32
     if [ ! -f $tsdir/scripts/config.guess ]; then
@@ -116,7 +117,7 @@
 fi
 
 
-if (gettext --version </dev/null 2>/dev/null | awk 'NR==1 { split($4,A,"\."); \
+if (gettext --version </dev/null 2>/dev/null | awk 'NR==1 { split($4,A,"."); \
     X=10000*A[1]+100*A[2]+A[3]; echo X; if( X >= 1038 ) exit 1; exit 0}')
     then
     echo "**Error**: You must have "\`gettext\'" installed to compile $PGM."
@@ -134,8 +135,9 @@
 echo "Running gettextize...  Ignore non-fatal messages."
 echo "no" | gettextize --force
 
+gettext_lib=`which gettext | sed -e 's#bin/gettext##'`share/aclocal
 echo "Running aclocal..."
-aclocal
+aclocal -I $gettext_lib
 echo "Running autoheader..."
 autoheader
 echo "Running automake --gnu ..."