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

@@ -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

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.*

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