From 97783315c9db84015ffb4360dc09a4e5df528dba Mon Sep 17 00:00:00 2001
From: imaginos <imaginos@726aef4b-f618-498e-8847-2d620e286838>
Date: Thu, 31 Mar 2005 20:49:24 +0000
Subject: [PATCH] use @prefix@ for install dest

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@54 726aef4b-f618-498e-8847-2d620e286838
---
 Makefile.in         | 11 ++++-------
 modules/Makefile.in |  9 +++------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6c4c2ccd..332e2d26 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,11 +1,8 @@
-ifneq ($(MAKE),gmake)
-# If you got an ERROR on the previous line, then you aren't using gmake
-endif
-
 CXX=g++
 CXXFLAGS=@CXXFLAGS@
 INCLUDES=@INCLUDES@
 LIBS=@LIBS@
+prefix=@prefix@
 
 OBJS=main.o znc.o User.o IRCSock.o UserSock.o DCCBounce.o DCCSock.o Chan.o Nick.o Server.o Modules.o md5.o Buffer.o Utils.o
 SRCS=main.cpp znc.cpp User.cpp IRCSock.cpp UserSock.cpp DCCBounce.cpp DCCSock.cpp Chan.cpp Nick.cpp Server.cpp Modules.cpp md5.cpp Buffer.cpp Utils.cpp
@@ -36,6 +33,6 @@ clean:
 	$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $*.o $*.cpp
 
 install: znc @MODTARGET@
-	mkdir -p $(DEST)
-	install -m 0711 znc $(DEST)
-	(cd modules; $(MAKE) DEST=$(DEST))	
+	mkdir -p $(prefix)
+	install -m 0711 znc $(prefix)
+	(cd modules; $(MAKE))	
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 076cd013..4a762d01 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -1,7 +1,4 @@
-ifneq ($(MAKE),gmake)
-# If you got an ERROR on the previous line, then you aren't using gmake
-endif
-
+prefix=@prefix@
 CXX=g++
 CXXFLAGS=@CXXFLAGS@
 INCLUDES=@INCLUDES@ -I..
@@ -17,8 +14,8 @@ depend::
 	g++ -M $(CXXFLAGS) $(SRCS) $(INCLUDES) >.depend
 
 install: all
-	mkdir -p $(DEST)/modules
-	install -m 0711 *.so $(DEST)/modules
+	mkdir -p $(prefix)/modules
+	install -m 0711 *.so $(prefix)/modules
 
 clean:
 	rm -rf *.so *.o core core.*