[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    kde-config patch
From:       "Ian Reinhart Geiser" <geiseri () yahoo ! com>
Date:       2004-09-03 19:44:55
Message-ID: 2307.66.92.236.216.1094240695.squirrel () 66 ! 92 ! 236 ! 216
[Download RAW message or body]

Greetings,
Seeing as debian installs the KDE headers to ${prefix}/include/kde the
hack in the KDE build system has issues for me.  The attached patch adds
the path to the includes.  This also adds consitency since we already
provide the library locations.

Currently in the configure scripts we do a:
`kde-config --prefix`/include
it would now be:
'kde-config --install include`

Cheers
-ian reinhart geiser

May I commit?
-- 
--
+-Ian Reinhart Geiser geiseri@sourcextreme.com
+-Vice President of Engineering
+-http://www.sourcextreme.com
+-It's not that we don't make mistakes, we just don't keep them around.
["kde-config.patch" (text/plain)]

Index: kde-config.cpp.in
===================================================================
RCS file: /home/kde/kdelibs/kdecore/kde-config.cpp.in,v
retrieving revision 1.11
diff -u -u -r1.11 kde-config.cpp.in
--- kde-config.cpp.in	3 Jan 2004 17:32:50 -0000	1.11
+++ kde-config.cpp.in	3 Sep 2004 19:38:36 -0000
@@ -76,6 +76,16 @@
         result = result.replace(index, 9, "@libdir@");
         changed = true;
     }
+    index = result.find("${includedir}");
+    if (index >= 0) {
+        result = result.replace(index, 20, "@includedir@");
+        changed = true;
+    }
+    index = result.find("$(includedir)");
+    if (index >= 0) {
+        result = result.replace(index, 20, "@includedir@");
+        changed = true;
+    }
     index = result.find("${sysconfdir}");
     if (index >= 0) {
         result = result.replace(index, 13, "@sysconfdir@");
@@ -155,6 +165,7 @@
             "icon", I18N_NOOP("Icons"),
             "kcfg", I18N_NOOP("Configuration description files"),
             "lib", I18N_NOOP("Libraries"),
+            "include", I18N_NOOP("Includes"),
             "locale", I18N_NOOP("Translation files for KLocale"),
             "mime", I18N_NOOP("Mime types"),
             "module", I18N_NOOP("Loadable modules"),
@@ -233,6 +244,7 @@
             "xdgconf-menu", "@xdg_menudir@",
             "xdgdata-apps", "@xdg_appsdir@",
             "xdgdata-dirs", "@xdg_directorydir@",
+            "include", "@includedir@",
             0, 0
         };
         int index = 0;

[prev in list] [next in list] [prev in thread] [next in thread]