From 2814df8faacb466191d94ec11a04013fe0023d70 Mon Sep 17 00:00:00 2001
From: imaginos <imaginos@726aef4b-f618-498e-8847-2d620e286838>
Date: Sat, 2 Apr 2005 22:50:47 +0000
Subject: [PATCH] make it so system properly deployed

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@61 726aef4b-f618-498e-8847-2d620e286838
---
 Makefile.in         | 6 +++---
 configure           | 2 ++
 configure.in        | 2 ++
 modules/Makefile.in | 6 +++---
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 332e2d26..0c67d1fc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -33,6 +33,6 @@ clean:
 	$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $*.o $*.cpp
 
 install: znc @MODTARGET@
-	mkdir -p $(prefix)
-	install -m 0711 znc $(prefix)
-	(cd modules; $(MAKE))	
+	mkdir -p $(DEST)$(prefix)/bin
+	install -m 0711 znc $(DEST)$(prefix)/bin
+	(cd modules; $(DEST)$(MAKE))	
diff --git a/configure b/configure
index 2f42957d..027df9fc 100755
--- a/configure
+++ b/configure
@@ -2826,6 +2826,8 @@ fi
 	if test -n "$ISSUN"; then
 		MODFLAGS="$MODFLAGS -mimpure-text"
 	fi
+
+	appendCXX "-D_MODDIR_=\\\"${prefix}/share/znc\\\""
 fi
 
 #
diff --git a/configure.in b/configure.in
index a60420c1..2ff5528e 100644
--- a/configure.in
+++ b/configure.in
@@ -65,6 +65,8 @@ if test "$MODULES" = "yes"; then
 	if test -n "$ISSUN"; then
 		MODFLAGS="$MODFLAGS -mimpure-text"
 	fi
+
+	appendCXX "-D_MODDIR_=\\\"${prefix}/share/znc\\\""
 fi
 
 #
diff --git a/modules/Makefile.in b/modules/Makefile.in
index c0deb05f..924dbe2e 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -14,13 +14,13 @@ depend::
 	g++ -M $(CXXFLAGS) $(SRCS) $(INCLUDES) >.depend
 
 install: all create_install_dir $(INSTALL_TARGS)
-	install -m 0711 *.so $(prefix)/modules
+	install -m 0711 *.so $(prefix)/share/znc
 
 create_install_dir:
-	mkdir -p $(prefix)/modules
+	mkdir -p $(prefix)/share/znc
 
 install_%:
-	install -m 0711 $(subst install_,,$@) $(prefix)/modules
+	install -m 0711 $(subst install_,,$@) $(prefix)/share
 
 clean:
 	rm -rf *.so *.o core core.*