diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-15 22:12:24 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-19 11:52:15 +0100 |
| commit | 98e5534e65712641930173f85262726d6fd6496e (patch) | |
| tree | 634fc4810b869f0789a0c31d39a3a8f0a8588ec1 /Configurations | |
| parent | 5386287cfcf0a4165fac742aa21455db3d49b3ab (diff) | |
Try removing installation directories after having uninstalled files
Of course, if there are remaining files in a directory, it won't be removed.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 24c6fdf1a2..a8d5cff3a8 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -172,6 +172,7 @@ AR=$(CROSS_COMPILE){- $target{ar} || "ar" -} $(ARFLAGS) r RANLIB= {- $target{ranlib} -} NM= $(CROSS_COMPILE){- $target{nm} || "nm" -} RM= rm -f +RMDIR= rmdir TAR= {- $target{tar} || "tar" -} TARFLAGS= {- $target{tarflags} -} MAKEDEPEND=$(CROSS_COMPILE){- $config{makedepprog} -} @@ -327,6 +328,8 @@ uninstall_dev: echo "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \ $(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \ done + -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include/openssl + -$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include @set -e; for l in $(LIBS); do \ fn=`basename $$l`; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \ @@ -357,6 +360,10 @@ uninstall_dev: @$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc @echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc" @$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc + @echo $(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig + -@$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig + @echo $(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) + -@$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR) install_engines: @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @@ -384,6 +391,8 @@ uninstall_engines: echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn"; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \ done + @echo "$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines" + -@$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines install_runtime: @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @@ -457,6 +466,10 @@ uninstall_runtime: done : {- output_on() unless windowsdll(); "" -}; $(RM) $(DESTDIR)$(OPENSSLDIR)/openssl.cnf + @echo "$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin" + -@$(RMDIR) $(DESTDIR)$(INSTALLTOP)/bin + @echo "$(RMDIR) $(DESTDIR)$(OPENSSLDIR)/misc" + -@$(RMDIR) $(DESTDIR)$(OPENSSLDIR)/misc # A method to extract all names from a .pod file # The first sed extracts everything between "=head1 NAME" and the next =head1 |