Configurations/10-main.conf: fix solaris64-*-cc link problems.

[openssl.git] / Configurations / unix-Makefile.tmpl

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 9feb4b1bbcc6eb388ef77e94b888dcd217f5079a..608c20417f3a4ead966d9ec927e9ef2a053cf324 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -346,10 +346,15 @@ install_ssldirs:
                mv -f $(DESTDIR)$(OPENSSLDIR)/misc/$$fn.new \
                      $(DESTDIR)$(OPENSSLDIR)/misc/$$fn; \
        done
-       @echo "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf"
+       @echo "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist"
        @cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
        @chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new
-       @mv -f  $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl.cnf
+       @mv -f  $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.new $(DESTDIR)$(OPENSSLDIR)/openssl.cnf.dist
+       @if ! [ -f "$(DESTDIR)$(OPENSSLDIR)/openssl.cnf" ]; then \
+               echo "install $(SRCDIR)/apps/openssl.cnf -> $(DESTDIR)$(OPENSSLDIR)/openssl.cnf"; \
+               cp $(SRCDIR)/apps/openssl.cnf $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \
+               chmod 644 $(DESTDIR)$(OPENSSLDIR)/openssl.cnf; \
+       fi
 
 install_dev:
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@@ -573,7 +578,7 @@ PROCESS_PODS=\
                [ -z "$$SEC" ] && SEC=$$defsec; \
                fn=`basename $$p .pod`; \
                Name=$$fn; \
-               NAME=`echo $$fn | tr [a-z] [A-Z]`; \
+               NAME=`echo $$fn | tr '[a-z]' '[A-Z]'`; \
                suf=`eval "echo $$OUTSUFFIX"`; \
                top=`eval "echo $$OUTTOP"`; \
                $(PERL) $(SRCDIR)/util/mkdir-p.pl $$top/man$$SEC; \
@@ -586,8 +591,8 @@ PROCESS_PODS=\
                      comp_n="$$n"; \
                      comp_fn="$$fn"; \
                      case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
-                         comp_n=`echo "$$n" | tr [A-Z] [a-z]`; \
-                         comp_fn=`echo "$$fn" | tr [A-Z] [a-z]`; \
+                         comp_n=`echo "$$n" | tr '[A-Z]' '[a-z]'`; \
+                         comp_fn=`echo "$$fn" | tr '[A-Z]' '[a-z]'`; \
                          ;; \
                      esac; \
                      if [ "$$comp_n" != "$$comp_fn" ]; then \
@@ -616,8 +621,8 @@ UNINSTALL_DOCS=\
                    comp_n="$$n"; \
                    comp_fn="$$fn"; \
                    case "$(PLATFORM)" in DJGPP|Cygwin*|mingw*|darwin*-*-cc) \
-                       comp_n=`echo "$$n" | tr [A-Z] [a-z]`; \
-                       comp_fn=`echo "$$fn" | tr [A-Z] [a-z]`; \
+                       comp_n=`echo "$$n" | tr '[A-Z]' '[a-z]'`; \
+                       comp_fn=`echo "$$fn" | tr '[A-Z]' '[a-z]'`; \
                        ;; \
                    esac; \
                    if [ "$$comp_n" != "$$comp_fn" ]; then \