Fixed installation dirs flags

configure.ac

@@ -52,17 +52,12 @@ MOO_AC_PYGTK
 MOO_AC_PCRE
 
 
-MOO_COMPONENTS
-MOO_AC_FLAGS
-
-
-################################################################################
-#  Installation directories, etc.
-#
 MOO_SRC_PREFIX="moo"
 AC_SUBST(MOO_SRC_PREFIX)
-MOO_AC_SET_DIRS([moo-1.0])
 AM_CONDITIONAL(MOO_BUILD_LIB, false)
+MOO_COMPONENTS
+MOO_AC_SET_DIRS([moo-1.0])
+MOO_AC_FLAGS
 
 
 ################################################################################

m4/moo-dirs.m4

@@ -2,29 +2,12 @@
 # MOO_AC_SET_DIRS(base)
 #
 AC_DEFUN([MOO_AC_SET_DIRS],[
-    datadir=share
-    libdir=lib
-
-    if test "x${prefix}" = "xNONE"; then
-        prefix=${ac_default_prefix}
-    fi
-
-    if test "x{datadir}" = "xNONE"; then
-        datadir=${ac_default_datadir}
-    fi
-    if test "x{libdir}" = "xNONE"; then
-        libdir=${ac_default_libdir}
-    fi
-
-    MOO_DATA_DIR="${prefix}/${datadir}/$1"
+    MOO_DATA_DIR="${datadir}/$1"
     AC_SUBST(MOO_DATA_DIR)
-    AC_DEFINE_UNQUOTED(MOO_DATA_DIR, "${MOO_DATA_DIR}", [data dir])
 
-    MOO_LIB_DIR="${prefix}/${libdir}/$1"
+    MOO_LIB_DIR="${libdir}/$1"
     AC_SUBST(MOO_LIB_DIR)
-    AC_DEFINE_UNQUOTED(MOO_LIB_DIR, "${MOO_LIB_DIR}", [lib dir])
 
     MOO_TEXT_LANG_FILES_DIR="${MOO_DATA_DIR}/syntax"
     AC_SUBST(MOO_TEXT_LANG_FILES_DIR)
-    AC_DEFINE_UNQUOTED(MOO_TEXT_LANG_FILES_DIR, "${MOO_TEXT_LANG_FILES_DIR}", [lang files dir])
 ])

m4/moo-flags.m4

@@ -4,6 +4,7 @@
 AC_DEFUN([MOO_AC_FLAGS],[
     AC_REQUIRE([MOO_AC_FAM])
     AC_REQUIRE([MOO_PKG_CHECK_GTK_VERSIONS])
+    AC_REQUIRE([MOO_AC_SET_DIRS])
 
     moo_top_src_dir=`cd $srcdir && pwd`
     moo_top_build_dir=`cd ./$ac_top_builddir && pwd`
@@ -14,14 +15,16 @@ AC_DEFUN([MOO_AC_FLAGS],[
         MOO_LIBS="$MOO_LIBS $FAM_LIBS"
     fi
 
-    AC_SUBST(MOO_CFLAGS)
-    AC_SUBST(MOO_LIBS)
+    MOO_CFLAGS="$MOO_CFLAGS -DMOO_DATA_DIR=\\\"${MOO_DATA_DIR}\\\" -DMOO_LIB_DIR=\\\"${MOO_LIB_DIR}\\\""
 
     ################################################################################
     #  MooEdit stuff
     #
     if test "x$build_mooedit" != "xno"; then
-        MOO_CFLAGS="$MOO_CFLAGS $XML_CFLAGS"
+        MOO_CFLAGS="$MOO_CFLAGS $XML_CFLAGS -DMOO_TEXT_LANG_FILES_DIR=\\\"${MOO_TEXT_LANG_FILES_DIR}\\\""
         MOO_LIBS="$MOO_LIBS $XML_LIBS"
     fi
+
+    AC_SUBST(MOO_CFLAGS)
+    AC_SUBST(MOO_LIBS)
 ])

moo.kdevelop

@@ -24,7 +24,7 @@
     </ignoreparts>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description></description>
+    <description/>
     <secondaryLanguages>
       <language>C</language>
     </secondaryLanguages>
@@ -33,13 +33,13 @@
   <kdevautoproject>
     <general>
       <activetarget>moo/libmoo.la</activetarget>
-      <useconfiguration>mingw</useconfiguration>
+      <useconfiguration>debug</useconfiguration>
     </general>
     <run>
       <mainprogram>medit</mainprogram>
       <directoryradio>executable</directoryradio>
       <customdirectory>/</customdirectory>
-      <programargs></programargs>
+      <programargs/>
       <terminal>false</terminal>
       <autocompile>false</autocompile>
       <envvars>
@@ -194,18 +194,18 @@
       <abortonerror>true</abortonerror>
       <numberofjobs>1</numberofjobs>
       <dontact>false</dontact>
-      <makebin></makebin>
+      <makebin/>
       <prio>0</prio>
     </make>
   </kdevautoproject>
   <kdevdebugger>
     <general>
-      <dbgshell></dbgshell>
+      <dbgshell/>
       <programargs>--g-fatal-warnings</programargs>
-      <gdbpath></gdbpath>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <gdbpath/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>true</floatingtoolbar>
@@ -306,7 +306,7 @@
     </codecompletion>
     <references/>
     <creategettersetter>
-      <prefixGet></prefixGet>
+      <prefixGet/>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>