From 525f0c140ffa43d6bcf0247d688543dc7b00afad Mon Sep 17 00:00:00 2001
From: imaginos <imaginos@726aef4b-f618-498e-8847-2d620e286838>
Date: Mon, 4 Apr 2005 01:49:43 +0000
Subject: [PATCH] change to DESTDIR and only install mods if enabled

git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@95 726aef4b-f618-498e-8847-2d620e286838
---
 Makefile.in         | 12 ++++++------
 modules/Makefile.in |  4 ++--
 znc.spec            |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 1d7cd515..e2fe7a64 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,9 +36,9 @@ distclean: clean
 	$(CXX) $(CXXFLAGS) $(INCLUDES) -c -o $*.o $*.cpp
 
 install: znc @MODTARGET@
-	mkdir -p $(DEST)$(prefix)/bin
-	mkdir -p $(DEST)$(prefix)/include/znc
-	install -m 0711 znc $(DEST)$(prefix)/bin
-	install -m 0755 znc-config $(DEST)$(prefix)/bin
-	install -m 0644 *.h $(DEST)$(prefix)/include/znc
-	(cd modules; $(MAKE) install DEST=$(DEST))
+	mkdir -p $(DESTDIR)$(prefix)/bin
+	mkdir -p $(DESTDIR)$(prefix)/include/znc
+	install -m 0711 znc $(DESTDIR)$(prefix)/bin
+	install -m 0755 znc-config $(DESTDIR)$(prefix)/bin
+	install -m 0644 *.h $(DESTDIR)$(prefix)/include/znc
+	if test -n "@MODTARGET@"; then (cd modules; $(MAKE) install DESTDIR=$(DESTDIR)); fi
diff --git a/modules/Makefile.in b/modules/Makefile.in
index c958d6a9..ade4d358 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -26,10 +26,10 @@ install: all create_install_dir $(INSTALL_TARGS)
 	@echo -n ""
 
 create_install_dir:
-	mkdir -p $(DEST)$(prefix)/share/znc
+	mkdir -p $(DESTDIR)$(prefix)/share/znc
 
 install_%:
-	install -m 0711 $(subst install_,,$@) $(DEST)$(prefix)/share/znc
+	install -m 0711 $(subst install_,,$@) $(DESTDIR)$(prefix)/share/znc
 
 clean:
 	rm -rf *.so *.o core core.*
diff --git a/znc.spec b/znc.spec
index 103f375a..96e69597 100644
--- a/znc.spec
+++ b/znc.spec
@@ -26,7 +26,7 @@ make all
 rm -rf $RPM_BUILD_ROOT
 
 %install
-make install DEST=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 
 
 %files