Unix: Set the execute permission on installed shared libraries

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

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 34ba56a49705098bb0b1bd8f11a1af1b470ca166..567e2af890a8dcdf9f0693a1c49229fdee53d962 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -14,6 +14,10 @@
 
      sub windowsdll { $config{target} =~ /^(?:Cygwin|mingw)/ }
 
+     our $sover = $config{target} =~ /^mingw/
+         ? $config{shlib_major}."_".$config{shlib_minor}
+         : $config{shlib_major}.".".$config{shlib_minor};
+
      # shlib and shlib_simple both take a static library name and figure
      # out what the shlib name should be.
      #
@@ -144,7 +148,7 @@ LIBDIR={- #
           our $libdir = $config{libdir} || "lib$multilib";
           $libdir -}
 ENGINESDIR={- use File::Spec::Functions;
-              catdir($prefix,$libdir,"engines") -}
+              catdir($prefix,$libdir,"engines-$sover") -}
 
 MANDIR=$(INSTALLTOP)/share/man
 DOCDIR=$(INSTALLTOP)/share/doc/$(BASENAME)
@@ -364,7 +368,7 @@ install_dev:
                : {- output_off() if windowsdll(); "" -}; \
                echo "install $$s1 -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1"; \
                cp $$s1 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1.new; \
-               chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1.new; \
+               chmod 755 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1.new; \
                mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1.new \
                      $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn1; \
                if [ "$$fn1" != "$$fn2" ]; then \
@@ -374,7 +378,7 @@ install_dev:
                : {- output_on() if windowsdll(); "" -}{- output_off() unless windowsdll(); "" -}; \
                echo "install $$s2 -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2"; \
                cp $$s2 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2.new; \
-               chmod 644 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2.new; \
+               chmod 755 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2.new; \
                mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2.new \
                      $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn2; \
                : {- output_on() unless windowsdll(); "" -}; \
@@ -433,7 +437,7 @@ uninstall_dev:
 
 install_engines:
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
-       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/
+       @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/
        @echo "*** Installing engines"
        @set -e; for e in dummy $(ENGINES); do \
                if [ "$$e" = "dummy" ]; then continue; fi; \
@@ -441,11 +445,11 @@ install_engines:
                if [ "$$fn" = '{- dso("ossltest") -}' ]; then \
                        continue; \
                fi; \
-               echo "install $$e -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn"; \
-               cp $$e $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new; \
-               chmod 755 $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new; \
-               mv -f $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn.new \
-                     $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \
+               echo "install $$e -> $(DESTDIR)$(ENGINESDIR)/$$fn"; \
+               cp $$e $(DESTDIR)$(ENGINESDIR)/$$fn.new; \
+               chmod 755 $(DESTDIR)$(ENGINESDIR)/$$fn.new; \
+               mv -f $(DESTDIR)$(ENGINESDIR)/$$fn.new \
+                     $(DESTDIR)$(ENGINESDIR)/$$fn; \
        done
 
 uninstall_engines:
@@ -456,10 +460,10 @@ uninstall_engines:
                if [ "$$fn" = '{- dso("ossltest") -}' ]; then \
                        continue; \
                fi; \
-               echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn"; \
-               $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \
+               echo "$(RM) $(DESTDIR)$(ENGINESDIR)/$$fn"; \
+               $(RM) $(DESTDIR)$(ENGINESDIR)/$$fn; \
        done
-       -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines
+       -$(RMDIR) $(DESTDIR)$(ENGINESDIR)
 
 install_runtime:
        @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@@ -764,7 +768,7 @@ FORCE:
 
 # Building targets ###################################################
 
-libcrypto.pc libssl.pc openssl.pc: configdata.pm $(LIBS)
+libcrypto.pc libssl.pc openssl.pc: configdata.pm $(LIBS) {- join(" ",map { shlib_simple($_) } @{$unified_info{libraries}}) -}
 libcrypto.pc:
        @ ( echo 'prefix=$(INSTALLTOP)'; \
            echo 'exec_prefix=$${prefix}'; \