diff options
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 495edb91ee..8fa34a06e8 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -86,6 +86,7 @@ SHLIB_TARGET={- $target{shared_target} -} LIBS={- join(" ", map { $_.$libext } @{$unified_info{libraries}}) -} SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{libraries}}) -} +SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{libraries}}) -} ENGINES={- join(" ", map { dso($_) } @{$unified_info{engines}}) -} PROGRAMS={- join(" ", map { $_.$exeext } grep { !m|^test/| } @{$unified_info{programs}}) -} TESTPROGS={- join(" ", map { $_.$exeext } grep { m|^test/| } @{$unified_info{programs}}) -} @@ -103,13 +104,16 @@ GENERATED={- join(" ", grep { /\.o$/ } keys %{$unified_info{sources}} ), ( grep { /\.h$/ } keys %{$unified_info{generate}} )) -} +INSTALL_LIBS={- join(" ", map { $_.$libext } @{$unified_info{install}->{libraries}}) -} +INSTALL_SHLIBS={- join(" ", map { shlib($_) } @{$unified_info{install}->{libraries}}) -} +INSTALL_SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{install}->{libraries}}) -} +INSTALL_ENGINES={- join(" ", map { dso($_) } @{$unified_info{install}->{engines}}) -} +INSTALL_PROGRAMS={- join(" ", map { $_.$exeext } @{$unified_info{install}->{programs}}) -} {- output_off() if $disabled{apps}; "" -} BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash MISC_SCRIPTS=$(BLDDIR)/apps/CA.pl $(BLDDIR)/apps/tsget {- output_on() if $disabled{apps}; "" -} -SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{libraries}}) -} - # DESTDIR is for package builders so that they can configure for, say, # /usr/ and yet have everything installed to /tmp/somedir/usr/. # Normally it is left empty. @@ -355,7 +359,7 @@ install_dev: chmod 644 $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \ done @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) - @set -e; for l in $(LIBS); do \ + @set -e; for l in $(INSTALL_LIBS); do \ fn=`basename $$l`; \ echo "install $$l -> $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \ cp $$l $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn.new; \ @@ -365,7 +369,7 @@ install_dev: $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \ done @ : {- output_off() if $disabled{shared}; "" -} - @set -e; for s in $(SHLIB_INFO); do \ + @set -e; for s in $(INSTALL_SHLIB_INFO); do \ s1=`echo "$$s" | cut -f1 -d";"`; \ s2=`echo "$$s" | cut -f2 -d";"`; \ fn1=`basename $$s1`; \ @@ -414,13 +418,13 @@ uninstall_dev: done -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include/openssl -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include - @set -e; for l in $(LIBS); do \ + @set -e; for l in $(INSTALL_LIBS); do \ fn=`basename $$l`; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn; \ done @ : {- output_off() if $disabled{shared}; "" -} - @set -e; for s in $(SHLIB_INFO); do \ + @set -e; for s in $(INSTALL_SHLIB_INFO); do \ s1=`echo "$$s" | cut -f1 -d";"`; \ s2=`echo "$$s" | cut -f2 -d";"`; \ fn1=`basename $$s1`; \ @@ -448,12 +452,9 @@ install_engines: @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(ENGINESDIR)/ @echo "*** Installing engines" - @set -e; for e in dummy $(ENGINES); do \ + @set -e; for e in dummy $(INSTALL_ENGINES); do \ if [ "$$e" = "dummy" ]; then continue; fi; \ fn=`basename $$e`; \ - if [ "$$fn" = '{- dso("ossltest") -}' ]; then \ - continue; \ - fi; \ echo "install $$e -> $(DESTDIR)$(ENGINESDIR)/$$fn"; \ cp $$e $(DESTDIR)$(ENGINESDIR)/$$fn.new; \ chmod 755 $(DESTDIR)$(ENGINESDIR)/$$fn.new; \ @@ -463,7 +464,7 @@ install_engines: uninstall_engines: @echo "*** Uninstalling engines" - @set -e; for e in dummy $(ENGINES); do \ + @set -e; for e in dummy $(INSTALL_ENGINES); do \ if [ "$$e" = "dummy" ]; then continue; fi; \ fn=`basename $$e`; \ if [ "$$fn" = '{- dso("ossltest") -}' ]; then \ @@ -480,7 +481,7 @@ install_runtime: @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/misc @echo "*** Installing runtime files" @ : {- output_off() unless windowsdll(); "" -} - @set -e; for s in dummy $(SHLIBS); do \ + @set -e; for s in dummy $(INSTALL_SHLIBS); do \ if [ "$$s" = "dummy" ]; then continue; fi; \ fn=`basename $$s`; \ echo "install $$s -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ @@ -490,7 +491,7 @@ install_runtime: $(DESTDIR)$(INSTALLTOP)/bin/$$fn; \ done @ : {- output_on() unless windowsdll(); "" -} - @set -e; for x in dummy $(PROGRAMS); do \ + @set -e; for x in dummy $(INSTALL_PROGRAMS); do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ echo "install $$x -> $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ @@ -511,7 +512,7 @@ install_runtime: uninstall_runtime: @echo "*** Uninstalling runtime files" - @set -e; for x in dummy $(PROGRAMS); \ + @set -e; for x in dummy $(INSTALL_PROGRAMS); \ do \ if [ "$$x" = "dummy" ]; then continue; fi; \ fn=`basename $$x`; \ @@ -533,7 +534,7 @@ uninstall_runtime: $(RM) $(DESTDIR)$(OPENSSLDIR)/misc/$$fn; \ done @ : {- output_off() unless windowsdll(); "" -} - @set -e; for s in dummy $(SHLIBS); do \ + @set -e; for s in dummy $(INSTALL_SHLIBS); do \ if [ "$$s" = "dummy" ]; then continue; fi; \ fn=`basename $$s`; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/bin/$$fn"; \ |