Skip to content

Commit

Permalink
make uninstall does not remove .so symlinks #1017
Browse files Browse the repository at this point in the history
  • Loading branch information
aleks-f committed Oct 31, 2017
1 parent 342c9a7 commit 4d4c857
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
18 changes: 14 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,11 +102,21 @@ install: libexecs
fi ; \
done
ifeq ($(OSNAME), Cygwin)
find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*" -type f -exec cp -f {} $(INSTALLDIR)/bin \;
find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/bin \;
find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*" -type f -exec cp -f {} $(INSTALLDIR)/bin \;
find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "cygPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/bin \;
endif
find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
find $(POCO_BUILD)/lib/$(OSNAME)/$(OSARCH) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;

uninstall:
[ -d $(INSTALLDIR)/include/Poco ] && rm -rf $(INSTALLDIR)/include/Poco || echo "No installed Poco headers found";
[ -d $(INSTALLDIR)/include/CppUnit ] && rm -rf $(INSTALLDIR)/include/CppUnit || echo "No installed CppUnit headers found";
ifeq ($(OSNAME), Cygwin)
find $(INSTALLDIR)/bin -name "cygPoco*" -type f -exec rm -f {} \;
find $(INSTALLDIR)/bin -name "cygPoco*" -type l -exec rm -f {} \;
endif
find $(INSTALLDIR)/lib -name "libPoco*" -type f -exec rm -f {} \;
find $(INSTALLDIR)/lib -name "libPoco*" -type l -exec rm -f {} \;

# -------------------------------------------------------------------------------------------------------------------------------------
libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec
Expand Down
2 changes: 1 addition & 1 deletion openssl
Submodule openssl updated 1 files
+2 −8 build.ps1

0 comments on commit 4d4c857

Please sign in to comment.