mirror of
https://github.com/znc/znc.git
synced 2026-07-05 17:31:06 +02:00
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
This commit is contained in:
+5
-3
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user