From 0917e51c541e1e4e8dc8bcfa1de636e6f44e4f03 Mon Sep 17 00:00:00 2001
From: Kris Maglione <kris@suckless.org>
Date: Mon, 24 May 2010 08:49:12 -0400
Subject: [PATCH] Fix lib installation paths.

---
 mk/dir.mk |  3 +--
 mk/hdr.mk | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/mk/dir.mk b/mk/dir.mk
index 3344bf84..28cb2c42 100644
--- a/mk/dir.mk
+++ b/mk/dir.mk
@@ -2,8 +2,7 @@ MKSUBDIR = \
 	set -e;							\
 	targ=$@; targ=$${targ\#d};				\
 	for i in $$dirs; do					\
-		export $(SUBMAKE_EXPORT);			\
-		export BASE=$(BASE)$$i/;			\
+		export $(SUBMAKE_EXPORT) BASE=$(BASE)$$i/;	\
 		if [ ! -d $$i ]; then				\
 			echo Skipping nonexistent directory: $$i 1>&2;	\
 		else						\
diff --git a/mk/hdr.mk b/mk/hdr.mk
index f3143996..24037248 100644
--- a/mk/hdr.mk
+++ b/mk/hdr.mk
@@ -94,45 +94,45 @@ MAKEFILES=.depend
 
 INSTALL= _install() { set -e; \
 		 dashb=$$1; [ $$1 = -b ] && shift; \
-		 d=$$(dirname $$3); \
-		 if [ ! -d $(DESTDIR)$$d ]; then echo MKDIR $$d; mkdir -p $(DESTDIR)$$d; fi; \
+		 d=$(DESTDIR)$$3; f=$$3/$$(basename $$4); \
+		 if [ ! -d $$d ]; then echo MKDIR $$3; mkdir -p $$d; fi; \
 		 echo INSTALL $$($(CLEANNAME) $(BASE)$$2); \
 		 [ -n "$(noisycc)" ] && set -x; \
 		 if [ "$$dashb" = -b ]; \
-		 then cp -f $$2 $(DESTDIR)$$3; \
-		 else $(FILTER) <$$2 >$(DESTDIR)$$3; \
+		 then cp -f $$2 $$f; \
+		 else $(FILTER) <$$2 >$$f; \
 		 fi; \
-		 chmod $$1 $(DESTDIR)$$3; \
+		 chmod $$1 $$f; \
 		 set +x; \
 	 }; _install
 UNINSTALL= _uninstall() { set -e; \
 	           echo UNINSTALL $$($(CLEANNAME) $(BASE)$$2); \
 		   [ -n "$(noisycc)" ] && set -x; \
-		   rm -f $(DESTDIR)$$3; \
+		   rm -f $(DESTDIR)$$3/$$(basename $$4); \
 	   }; _uninstall
 
 .out.install:
-	$(INSTALL) -b 0755 $< $(BIN)/$*
+	$(INSTALL) -b 0755 $< $(BIN) $*
 .out.uninstall:
-	$(UNINSTALL) $< $(BIN)/$*
+	$(UNINSTALL) $< $(BIN) $*
 
 .a.install .$(SOEXT).install:
-	$(INSTALL) -b 0644 $< $(LIBDIR)/$<
+	$(INSTALL) -b 0644 $< $(LIBDIR) $<
 .a.uninstall .$(SOEXT).uninstall:
-	$(UNINSTALL) $< $(LIBDIR)/$<
+	$(UNINSTALL) $< $(LIBDIR) $<
 
 .h.install:
-	$(INSTALL) 0644 $< $(INCLUDE)/$<
+	$(INSTALL) 0644 $< $(INCLUDE) $<
 .h.uninstall:
-	$(UNINSTALL) $< $(INCLUDE)/$<
+	$(UNINSTALL) $< $(INCLUDE) $<
 
 .pdf.install:
-	$(INSTALL) -b 0644 $< $(DOC)/$<
+	$(INSTALL) -b 0644 $< $(DOC) $<
 .pdf.uninstall:
-	$(UNINSTALL) $< $(DOC)/$<
+	$(UNINSTALL) $< $(DOC) $<
 
-INSTALMAN=   _installman()   { man=$${1\#\#*.}; $(INSTALL) 0644 $$1 $(MAN)/man$$man/$$1; }; _installman
-UNINSTALLMAN=_uninstallman() { man=$${1\#\#*.}; $(UNINSTALL) $$1 $(MAN)/man$$man/$$1; }; _uninstallman
+INSTALMAN=   _installman()   { man=$${1\#\#*.}; $(INSTALL) 0644 $$1 $(MAN)/man$$man $$1; }; _installman
+UNINSTALLMAN=_uninstallman() { man=$${1\#\#*.}; $(UNINSTALL) $$1 $(MAN)/man$$man $$1; }; _uninstallman
 MANSECTIONS=1 2 3 4 5 6 7 8 9
 $(MANSECTIONS:%=.%.install):
 	$(INSTALMAN) $<