From 5a2844f920fd1285671bb7fd60785b45a0d81315 Mon Sep 17 00:00:00 2001
From: psychon <psychon@726aef4b-f618-498e-8847-2d620e286838>
Date: Mon, 5 Apr 2010 15:36:19 +0000
Subject: [PATCH] Install webskins to the right directory and fix some spelling

If one used --with-module-prefix=bla to set a different than the default
module-prefix, the files were still installed to the default directory.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1888 726aef4b-f618-498e-8847-2d620e286838
---
 Makefile.in | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index a7cdfa92..66d6de89 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,6 +18,7 @@ LDFLAGS  := @LDFLAGS@
 LIBS     := @LIBS@
 LIBZNC   := @LIBZNC@
 LIBZNCDIR:= @LIBZNCDIR@
+MODDIR   := @MODDIR@
 PKGCONFIGDIR := $(libdir)/pkgconfig
 
 LIB_SRCS  := ZNCString.cpp Csocket.cpp znc.cpp User.cpp IRCSock.cpp Client.cpp DCCBounce.cpp \
@@ -69,8 +70,8 @@ install: znc $(LIBZNC)
 	mkdir -p $(DESTDIR)$(bindir)
 	mkdir -p $(DESTDIR)$(includedir)/znc
 	mkdir -p $(DESTDIR)$(PKGCONFIGDIR)
-	mkdir -p $(DESTDIR)$(libdir)/znc
-	cp -Rp webskins $(DESTDIR)$(libdir)/znc
+	mkdir -p $(DESTDIR)$(MODDIR)
+	cp -Rp webskins $(DESTDIR)$(MODDIR)
 	install -m 0755 znc $(DESTDIR)$(bindir)
 	install -m 0755 znc-config $(DESTDIR)$(bindir)
 	install -m 0755 znc-buildmod $(DESTDIR)$(bindir)
@@ -89,6 +90,7 @@ uninstall:
 	rm $(DESTDIR)$(bindir)/znc-buildmod
 	rm $(DESTDIR)$(includedir)/znc/*.h
 	rm $(DESTDIR)$(PKGCONFIGDIR)/znc.pc
+	rm -rf $(DESTDIR)$(MODDIR)/webskins
 	if test -n "$(LIBZNC)"; then \
 		rm $(DESTDIR)$(LIBZNCDIR)/$(LIBZNC) || exit 1 ; \
 		rmdir $(DESTDIR)$(LIBZNCDIR) || exit 1 ; \
@@ -100,6 +102,6 @@ uninstall:
 	rmdir $(DESTDIR)$(bindir)
 	rmdir $(DESTDIR)$(includedir)/znc
 	rmdir $(DESTDIR)$(PKGCONFIGDIR)
-	@echo "Successfully uninstalled, but emptry directories were left behind"
+	@echo "Successfully uninstalled, but empty directories were left behind"
 
 -include $(wildcard .depend/*.dep)