Skip to content

Commit 6fd7d3f

Browse files
committed
Fixed installation and deinstallation of shared object and library files
1 parent 2289e11 commit 6fd7d3f

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
=== 0.5.8 ===
66
* Fixed excessive header installation with proper one.
7+
* Fixed installation and deinstallation of shared object and library files.
78

89
=== 0.5.7 ===
910
* Updated makefiles: added `make tree` target.

src/Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -184,15 +184,18 @@ install: all
184184
@mkdir -p "$(DESTDIR)$(LIBDIR)/pkgconfig"
185185
@cp -r "$(CXX_HDR_PATHS)" "$(DESTDIR)$(INCDIR)/"
186186
@cp $(ARTIFACT_PC) "$(DESTDIR)$(LIBDIR)/pkgconfig/"
187-
@echo $(INSTALL) $(ARTIFACT_LIB) $(ARTIFACT_SLIB) -t "$(DESTDIR)$(LIBDIR)"
188-
@$(INSTALL) $(ARTIFACT_LIB) $(ARTIFACT_SLIB) -t "$(DESTDIR)$(LIBDIR)"
187+
@echo $(INSTALL) $(ARTIFACT_LIB) -t "$(DESTDIR)$(LIBDIR)"
188+
@$(INSTALL) $(ARTIFACT_LIB) -t "$(DESTDIR)$(LIBDIR)"
189+
@echo cp $(ARTIFACT_SLIB) -t "$(DESTDIR)$(LIBDIR)"
190+
@cp $(ARTIFACT_SLIB) -t "$(DESTDIR)$(LIBDIR)"
189191
@ln -sf $(notdir $(ARTIFACT_LIB)) "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_LIBLINK)"
190192
@ln -sf $(notdir $(ARTIFACT_SLIB)) "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_SLIBLINK)"
191193
@echo "Install OK"
192194

193195
uninstall:
194196
@echo "Uninstalling $($(ARTIFACT_VARS)_NAME)"
195197
@-rm -f "$(DESTDIR)$(LIBDIR)/$(notdir $(ARTIFACT_LIB))"
198+
@-rm -f "$(DESTDIR)$(LIBDIR)/$(notdir $(ARTIFACT_SLIB))"
196199
@-rm -f "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_LIBLINK)"
197200
@-rm -f "$(DESTDIR)$(LIBDIR)/$(ARTIFACT_SLIBLINK)"
198201
@-rm -f "$(DESTDIR)$(LIBDIR)/pkgconfig/$(notdir $(ARTIFACT_PC))"

0 commit comments

Comments
 (0)