From 262f8b8936536e31cb7f863d6b62657e4be2ac95 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Thu, 18 Jun 2015 02:13:40 +0200
Subject: [PATCH] Cleanup: Fix install/uninstall of both static and dynamic
 builds.

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 Makefile | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 6fa92d9..c03d915 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ STRIP      ?= $(CROSS)strip
 INSTALL    := install --backup=off
 STRIPINST  := $(INSTALL) -s --strip-program=$(CROSS)strip -m 0755
 
-ifneq ($(STATIC), 1)
+ifndef STATIC
 CFLAGS     += -fPIC
 endif
 CFLAGS     += -Os
@@ -79,7 +79,7 @@ $(OBJS): Makefile
 
 $(SOLIB): Makefile $(OBJS)
 	@printf "  LINK    %s\n" $@
-	@$(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $(OBJS) -lrt -lcrypt
+	@$(CC) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $(OBJS)
 
 $(STATICLIB): Makefile $(OBJS)
 	@printf "  ARCHIVE $@\n"
@@ -94,26 +94,30 @@ ifndef STATIC
 endif
 
 install-dev:
-	@install -d $(DESTDIR)$(incdir)
-	@for file in $(HEADERS); do	                                \
-		printf "  INSTALL $(DESTDIR)$(incdir)/$$file\n";	\
-		$(INSTALL) -m 0644 $$file $(DESTDIR)$(incdir)/$$file;	\
+	@install -d $(DESTDIR)$(incdir)/$(LIBNAME)
+	@for file in $(HEADERS); do	                                		\
+		printf "  INSTALL $(DESTDIR)$(incdir)/$(LIBNAME)/$$file\n";		\
+		$(INSTALL) -m 0644 $$file $(DESTDIR)$(incdir)/$(LIBNAME)/$$file;	\
 	done
 ifdef STATIC
 	@printf "  INSTALL $(DESTDIR)$(libdir)/$(STATICLIB)\n"
 	@install -d $(DESTDIR)$(libdir)
 	@$(INSTALL) $(STATICLIB) $(DESTDIR)$(libdir)/$(STATICLIB)
 endif
+	@install -d $(DESTDIR)$(datadir)
+	@for file in $(DISTFILES); do					\
+		printf "  INSTALL $(DESTDIR)$(datadir)/$$file\n";	\
+		install -m 0644 $$file $(DESTDIR)$(datadir)/$$file;	\
+	done
 
 install: install-exec install-dev
 
 uninstall:
+	-@$(RM) -r $(DESTDIR)$(datadir)
+	-@$(RM) -r $(DESTDIR)$(incdir)/$(LIBNAME)
 	-@$(RM) $(DESTDIR)$(libdir)/$(SOLIB)
 	-@$(RM) $(DESTDIR)$(libdir)/$(SYMLIB)
 	-@$(RM) $(DESTDIR)$(libdir)/$(STATICLIB)
-	-@for file in $(HEADERS); do			\
-		$(RM) $(DESTDIR)$(incdir)/$$file;	\
-	done
 
 strip: $(TARGET)
 	@printf "  STRIP   %s\n" $(TARGET)