generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Try removing installation directories after having uninstalled files

Browse Source 
Of course, if there are remaining files in a directory, it won't be removed.

Reviewed-by: Andy Polyakov <appro@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-15 22:12:24 +01:00
parent 5386287cfc
commit 98e5534e65
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Configurations/unix-Makefile.tmpl
View File

@ -172,6 +172,7 @@ AR=$(CROSS_COMPILE){- $target{ar} || "ar" -} $(ARFLAGS) r
RANLIB= {- $target{ranlib} -} RANLIB= {- $target{ranlib} -}
NM= $(CROSS_COMPILE){- $target{nm} || "nm" -} NM= $(CROSS_COMPILE){- $target{nm} || "nm" -}
RM= rm -f RM= rm -f
RMDIR= rmdir
TAR= {- $target{tar} || "tar" -} TAR= {- $target{tar} || "tar" -}
TARFLAGS= {- $target{tarflags} -} TARFLAGS= {- $target{tarflags} -}
MAKEDEPEND=$(CROSS_COMPILE){- $config{makedepprog} -} MAKEDEPEND=$(CROSS_COMPILE){- $config{makedepprog} -}
@ -327,6 +328,8 @@ uninstall_dev:
echo "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn"; \
$(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \ $(RM) $(DESTDIR)$(INSTALLTOP)/include/openssl/$$fn; \
done done
-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include/openssl
-$(RMDIR) $(DESTDIR)$(INSTALLTOP)/include
@set -e; for l in $(LIBS); do \ @set -e; for l in $(LIBS); do \
fn=`basename $$l`; \ fn=`basename $$l`; \
echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/$$fn"; \
@ -357,6 +360,10 @@ uninstall_dev:
@$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc @$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc
@echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc" @echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc"
@$(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: install_engines:
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@ -384,6 +391,8 @@ uninstall_engines:
echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn"; \ echo "$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn"; \
$(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \ $(RM) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines/$$fn; \
done done
@echo "$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines"
-@$(RMDIR) $(DESTDIR)$(INSTALLTOP)/$(LIBDIR)/engines
install_runtime: install_runtime:
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1) @[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@ -457,6 +466,10 @@ uninstall_runtime:
done done
: {- output_on() unless windowsdll(); "" -}; : {- output_on() unless windowsdll(); "" -};
$(RM) $(DESTDIR)$(OPENSSLDIR)/openssl.cnf $(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 # A method to extract all names from a .pod file
# The first sed extracts everything between "=head1 NAME" and the next =head1 # The first sed extracts everything between "=head1 NAME" and the next =head1