Temporary rename pkgconfig files to fix conflict between versions

Change-Id: I9455e8c563b40f5fb15951bce2da723779848615

diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 288b792..5204102 100644 (file)
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -348,7 +348,7 @@ LANG=C
 {- dependmagic('build_programs'); -}: build_programs_nodep
 
 build_generated: $(GENERATED_MANDATORY)
-build_libs_nodep: libcrypto.pc libssl.pc openssl.pc
+build_libs_nodep: libcrypto1.1.pc libssl1.1.pc openssl1.1.pc
 build_engines_nodep: $(ENGINES)
 build_programs_nodep: $(PROGRAMS) $(SCRIPTS)
 
@@ -419,7 +419,7 @@ clean: libclean
        $(RM) core
        $(RM) tags TAGS doc-nits
        $(RM) -r test/test-runs
-       $(RM) openssl.pc libcrypto.pc libssl.pc
+       $(RM) openssl1.1.pc libcrypto1.1.pc libssl1.1.pc
        -$(RM) `find . -name .git -prune -o -type l -print`
        $(RM) $(TARFILE)
 
@@ -554,15 +554,15 @@ install_dev: install_runtime_libs
        done
        @ : {- output_on() if $disabled{shared}; "" -}
        @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir)/pkgconfig
-       @$(ECHO) "install libcrypto.pc -> $(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc"
-       @cp libcrypto.pc $(DESTDIR)$(libdir)/pkgconfig
-       @chmod 644 $(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc
-       @$(ECHO) "install libssl.pc -> $(DESTDIR)$(libdir)/pkgconfig/libssl.pc"
-       @cp libssl.pc $(DESTDIR)$(libdir)/pkgconfig
-       @chmod 644 $(DESTDIR)$(libdir)/pkgconfig/libssl.pc
-       @$(ECHO) "install openssl.pc -> $(DESTDIR)$(libdir)/pkgconfig/openssl.pc"
-       @cp openssl.pc $(DESTDIR)$(libdir)/pkgconfig
-       @chmod 644 $(DESTDIR)$(libdir)/pkgconfig/openssl.pc
+       @$(ECHO) "install libcrypto1.1.pc -> $(DESTDIR)$(libdir)/pkgconfig/libcrypto1.1.pc"
+       @cp libcrypto1.1.pc $(DESTDIR)$(libdir)/pkgconfig
+       @chmod 644 $(DESTDIR)$(libdir)/pkgconfig/libcrypto1.1.pc
+       @$(ECHO) "install libssl1.1.pc -> $(DESTDIR)$(libdir)/pkgconfig/libssl1.1.pc"
+       @cp libssl1.1.pc $(DESTDIR)$(libdir)/pkgconfig
+       @chmod 644 $(DESTDIR)$(libdir)/pkgconfig/libssl1.1.pc
+       @$(ECHO) "install openssl1.1.pc -> $(DESTDIR)$(libdir)/pkgconfig/openssl1.1.pc"
+       @cp openssl1.1.pc $(DESTDIR)$(libdir)/pkgconfig
+       @chmod 644 $(DESTDIR)$(libdir)/pkgconfig/openssl1.1.pc
 
 uninstall_dev: uninstall_runtime_libs
        @$(ECHO) "*** Uninstalling development files"
@@ -602,9 +602,9 @@ uninstall_dev: uninstall_runtime_libs
                : {- output_on() unless windowsdll(); "" -}; \
        done
        @ : {- output_on() if $disabled{shared}; "" -}
-       $(RM) $(DESTDIR)$(libdir)/pkgconfig/libcrypto.pc
-       $(RM) $(DESTDIR)$(libdir)/pkgconfig/libssl.pc
-       $(RM) $(DESTDIR)$(libdir)/pkgconfig/openssl.pc
+       $(RM) $(DESTDIR)$(libdir)/pkgconfig/libcrypto1.1.pc
+       $(RM) $(DESTDIR)$(libdir)/pkgconfig/libssl1.1.pc
+       $(RM) $(DESTDIR)$(libdir)/pkgconfig/openssl1.1.pc
        -$(RMDIR) $(DESTDIR)$(libdir)/pkgconfig
        -$(RMDIR) $(DESTDIR)$(libdir)
 
@@ -848,8 +848,8 @@ FORCE:
 
 # Building targets ###################################################
 
-libcrypto.pc libssl.pc openssl.pc: configdata.pm $(LIBS) {- join(" ",map { shlib_simple($_) } @{$unified_info{libraries}}) -}
-libcrypto.pc:
+libcrypto1.1.pc libssl1.1.pc openssl1.1.pc: configdata.pm $(LIBS) {- join(" ",map { shlib_simple($_) } @{$unified_info{libraries}}) -}
+libcrypto1.1.pc:
        @ ( echo 'prefix=$(INSTALLTOP)'; \
            echo 'exec_prefix=$${prefix}'; \
            if [ -n "$(LIBDIR)" ]; then \
@@ -865,9 +865,9 @@ libcrypto.pc:
            echo 'Version: '$(VERSION); \
            echo 'Libs: -L$${libdir} -lcrypto'; \
            echo 'Libs.private: $(LIB_EX_LIBS)'; \
-           echo 'Cflags: -I$${includedir}' ) > libcrypto.pc
+           echo 'Cflags: -I$${includedir}' ) > libcrypto1.1.pc
 
-libssl.pc:
+libssl1.1.pc:
        @ ( echo 'prefix=$(INSTALLTOP)'; \
            echo 'exec_prefix=$${prefix}'; \
            if [ -n "$(LIBDIR)" ]; then \
@@ -880,11 +880,11 @@ libssl.pc:
            echo 'Name: OpenSSL-libssl'; \
            echo 'Description: Secure Sockets Layer and cryptography libraries'; \
            echo 'Version: '$(VERSION); \
-           echo 'Requires.private: libcrypto'; \
+           echo 'Requires.private: libcrypto1.1'; \
            echo 'Libs: -L$${libdir} -lssl'; \
-           echo 'Cflags: -I$${includedir}' ) > libssl.pc
+           echo 'Cflags: -I$${includedir}' ) > libssl1.1.pc
 
-openssl.pc:
+openssl1.1.pc:
        @ ( echo 'prefix=$(INSTALLTOP)'; \
            echo 'exec_prefix=$${prefix}'; \
            if [ -n "$(LIBDIR)" ]; then \
@@ -897,7 +897,7 @@ openssl.pc:
            echo 'Name: OpenSSL'; \
            echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
            echo 'Version: '$(VERSION); \
-           echo 'Requires: libssl libcrypto' ) > openssl.pc
+           echo 'Requires: libssl1.1 libcrypto1.1' ) > openssl1.1.pc
 
 configdata.pm: $(SRCDIR)/Configure $(SRCDIR)/config {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
        @echo "Detected changed: $?"