Move some -D flags to Makefile

Doing it like this is the only supported way with autoconf and works around
quite some messy mess.


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@2247 726aef4b-f618-498e-8847-2d620e286838

Makefile.in

@@ -39,6 +39,8 @@ CLEAN     := znc *.o core core.*
 DISTCLEAN := Makefile config.log config.status znc-config znc-buildmod .depend \
 	modules/.depend modules/Makefile man/Makefile znc.pc znc-uninstalled.pc
 
+CXXFLAGS += -D_MODDIR_=\"$(MODDIR)\" -D_DATADIR_=\"$(DATADIR)\"
+
 ifneq "$(V)" ""
 VERBOSE=1
 endif

configure

@@ -4210,9 +4210,6 @@ $as_echo "$as_me: WARNING: libiconv was not found, disabling the charset module"
 	fi
 fi
 
-appendCXX "-D_MODDIR_=\\\"${MODDIR}\\\""
-appendCXX "-D_DATADIR_=\\\"${DATADIR}\\\""
-
 
 
 

configure.in

@@ -439,9 +439,6 @@ then
 	fi
 fi
 
-appendCXX "-D_MODDIR_=\\\"${MODDIR}\\\""
-appendCXX "-D_DATADIR_=\\\"${DATADIR}\\\""
-
 AC_SUBST([CXXFLAGS])
 AC_SUBST([CPPFLAGS])
 AC_SUBST([MODFLAGS])

main.h

@@ -20,14 +20,6 @@
 #define VERSION_EXTRA ""
 #endif
 
-#ifndef _MODDIR_
-#define _MODDIR_ "/usr/lib/znc"
-#endif
-
-#ifndef _DATADIR_
-#define _DATADIR_ "/usr/share/znc"
-#endif
-
 #define NOTHING (void)0
 
 #define ALLMODULECALL(macFUNC, macEXITER)                                     \