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

List:       kde-devel
Subject:    PATCHED kdebase/kdm/kfrontend/Makefile.am
From:       Ingo Krabbe <ikrabbe.ask () web ! de>
Date:       2005-11-24 19:44:49
Message-ID: 200511242044.57372.ikrabbe.ask () web ! de
[Download RAW message or body]

[Attachment #2 (multipart/signed)]

[Attachment #4 (multipart/mixed)]


It seems this is worth to be checked in since I don't have KDE_CONFDIR, 
KDE_DATADIR and KDE_BINDIR Variables in config.h.  (Stephan Kulow says that 
3.5 has them in !)

This might be the only location where these paths are needed while compiling 
anyway, course of the config.ci Mechanism in kdebase/kdm which refers to 
these C Definitions.

Also need to patch : kdebase/workspace/kcontrol/kdm/Makefile.am

BYE INGO


["p1" (text/x-diff)]

Index: Makefile.am
===================================================================
--- Makefile.am	(Revision 483006)
+++ Makefile.am	(Arbeitskopie)
@@ -4,7 +4,10 @@ GENKDMCONF_FLAGS =
 SUBDIRS = themer themes pics sessions
 
 AM_CPPFLAGS = -I$(srcdir)/../backend -I.. -I$(top_srcdir)/workspace/kcontrol/background \
-    -I$(top_srcdir)/kdmlib $(all_includes)
+    -I$(top_srcdir)/kdmlib $(all_includes) \
+    -DKDE_CONFDIR=\"$(kde_confdir)\" -DKDE_DATADIR=\"$(kde_datadir)\" \
+    -DKDE_BINDIR=\"$(kde_bindir)\"
+
 
 bin_PROGRAMS = kdm_config kdm_greet krootimage genkdmconf kdmctl
 

["p2" (text/x-diff)]

Index: Makefile.am
===================================================================
--- Makefile.am	(Revision 483003)
+++ Makefile.am	(Arbeitskopie)
@@ -9,7 +9,9 @@ kcm_kdm_la_LIBADD = $(top_builddir)/work
 
 AM_CPPFLAGS= -I$(top_builddir)/workspace/kcontrol/background \
           -I$(top_srcdir)/workspace/kcontrol/background \
-          -I$(top_srcdir)/workspace/kdesktop $(all_includes)
+          -I$(top_srcdir)/workspace/kdesktop $(all_includes) \
+	    -DKDE_CONFDIR=\"$(kde_confdir)\" -DKDE_DATADIR=\"$(kde_datadir)\" \
+	    -DKDE_BINDIR=\"$(kde_bindir)\"
 
 METASOURCES = AUTO
 

[Attachment #9 (application/pgp-signature)]

>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<


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