diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-01-22 23:01:18 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-01-25 13:38:37 +0100 |
| commit | d9c22dde295eb3163a168c81688a7425d4db1902 (patch) | |
| tree | e3c124ca1488b4d6891fc5efc000f0ffdfa1ee8a /Configurations | |
| parent | c27e7922211ac4f7aee5573f605c3b3cbef0d0bc (diff) | |
Unix Makefile generator: Fix empty basename calls
Fixes #13933
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13935)
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index a331368311..174e52871e 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -654,20 +654,22 @@ install_dev: install_runtime_libs s1=`echo "$$s" | cut -f1 -d";"`; \ s2=`echo "$$s" | cut -f2 -d";"`; \ s3=`echo "$$s" | cut -f3 -d";"`; \ - fn1=`basename $$s1`; \ - fn2=`basename $$s2`; \ - fn3=`basename $$s3`; \ + fn1=`basename "$$s1"`; \ + fn2=`basename "$$s2"`; \ + fn3=`basename "$$s3"`; \ : {- output_off(); output_on() unless windowsdll() or sharedaix(); "" -}; \ if [ "$$fn2" != "" ]; then \ $(ECHO) "link $(DESTDIR)$(libdir)/$$fn2 -> $(DESTDIR)$(libdir)/$$fn1"; \ ln -sf $$fn1 $(DESTDIR)$(libdir)/$$fn2; \ fi; \ : {- output_off() unless windowsdll() or sharedaix(); output_on() if windowsdll(); "" -}; \ - $(ECHO) "install $$s3 -> $(DESTDIR)$(libdir)/$$fn3"; \ - cp $$s3 $(DESTDIR)$(libdir)/$$fn3.new; \ - chmod 755 $(DESTDIR)$(libdir)/$$fn3.new; \ - mv -f $(DESTDIR)$(libdir)/$$fn3.new \ - $(DESTDIR)$(libdir)/$$fn3; \ + if [ "$$fn3" != "" ]; then \ + $(ECHO) "install $$s3 -> $(DESTDIR)$(libdir)/$$fn3"; \ + cp $$s3 $(DESTDIR)$(libdir)/$$fn3.new; \ + chmod 755 $(DESTDIR)$(libdir)/$$fn3.new; \ + mv -f $(DESTDIR)$(libdir)/$$fn3.new \ + $(DESTDIR)$(libdir)/$$fn3; \ + fi; \ : {- output_off() if windowsdll(); output_on() if sharedaix(); "" -}; \ a=$(DESTDIR)$(libdir)/$$fn2; \ $(ECHO) "install $$s1 -> $$a"; \ @@ -721,9 +723,9 @@ uninstall_dev: uninstall_runtime_libs s1=`echo "$$s" | cut -f1 -d";"`; \ s2=`echo "$$s" | cut -f2 -d";"`; \ s3=`echo "$$s" | cut -f3 -d";"`; \ - fn1=`basename $$s1`; \ - fn2=`basename $$s2`; \ - fn3=`basename $$s3`; \ + fn1=`basename "$$s1"`; \ + fn2=`basename "$$s2"`; \ + fn3=`basename "$$s3"`; \ : {- output_off() if windowsdll(); "" -}; \ $(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn1"; \ $(RM) $(DESTDIR)$(libdir)/$$fn1; \ @@ -732,8 +734,10 @@ uninstall_dev: uninstall_runtime_libs $(RM) $(DESTDIR)$(libdir)/$$fn2; \ fi; \ : {- output_on() if windowsdll(); "" -}{- output_off() unless windowsdll(); "" -}; \ - $(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn3"; \ - $(RM) $(DESTDIR)$(libdir)/$$fn3; \ + if [ -n "$$fn3" ]; then \ + $(ECHO) "$(RM) $(DESTDIR)$(libdir)/$$fn3"; \ + $(RM) $(DESTDIR)$(libdir)/$$fn3; \ + fi; \ : {- output_on() unless windowsdll(); "" -}; \ done @ : {- output_on() if $disabled{shared}; "" -} |