Recent changes.

diff --git a/Makefile.org b/Makefile.org
index 1c5a0226a2bb5005180e70998e28541003a6fab9..aae587c894867055a192b6f1add3053ec0d0437e 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -677,7 +677,8 @@ install: all install_docs
                done; \
                (       here="`pwd`"; \
                        cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
-                       $(MAKE) -f $$here/Makefile link-shared ); \
+                       set $(MAKE); \
+                       $$1 -f $$here/Makefile link-shared ); \
        fi
 
 install_docs:
@@ -686,7 +687,7 @@ install_docs:
                $(INSTALL_PREFIX)$(MANDIR)/man3 \
                $(INSTALL_PREFIX)$(MANDIR)/man5 \
                $(INSTALL_PREFIX)$(MANDIR)/man7
-       @pod2man=`cd ../../util; ./pod2mantest ignore`; \
+       @pod2man=`cd util; ./pod2mantest ignore`; \
        for i in doc/apps/*.pod; do \
                fn=`basename $$i .pod`; \
                if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
@@ -697,7 +698,7 @@ install_docs:
                        --release=$(VERSION) `basename $$i`") \
                        >  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
        done; \
-       @for i in doc/crypto/*.pod doc/ssl/*.pod; do \
+       for i in doc/crypto/*.pod doc/ssl/*.pod; do \
                fn=`basename $$i .pod`; \
                if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
                echo "installing man$$sec/`basename $$i .pod`.$$sec"; \

diff --git a/config b/config
index 1cb614361490c89ac89e58d21e54a7dcb15e0c6c..09b6be1f029501bad8eda103ee59b182548e54ef 100755 (executable)
--- a/config
+++ b/config
@@ -384,6 +384,9 @@ done
 GCCVER=`(gcc -dumpversion) 2>/dev/null`
 if [ "$GCCVER" != "" ]; then
   CC=gcc
+  # then strip off whatever prefix egcs prepends the number with...
+  # Hopefully, this will work for any future prefixes as well.
+  GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z]*\-//'`
   # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
   # does give us what we want though, so we use that.  We just just the
   # major and minor version numbers.