[rygel] build: Correct sysconfdir for uninstalled case



commit 8830eb69c94dc50244bcb0b8ded0f49692fb0e0f
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Fri Feb 11 01:51:01 2011 +0200

    build: Correct sysconfdir for uninstalled case
    
    Use 'data' directory in source tree as the system config location when
    configured to run uninstalled.

 src/rygel/Makefile.am |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index d9937e4..d5d59e6 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -1,11 +1,13 @@
 if UNINSTALLED
 shareddir = $(abs_top_builddir)/data
+sysconfigdir = $(shareddir)
 desktopdir = $(shareddir)
 plugindir = $(abs_top_builddir)/src/plugins
 smallicondir = $(shareddir)/icons/48x48
 bigicondir = $(shareddir)/icons/120x120
 else
 shareddir = $(datadir)/rygel
+sysconfigdir = $(sysconfdir)
 desktopdir = $(datadir)/applications
 plugindir = $(libdir)/rygel-1.0
 smallicondir = $(datadir)/icons/hicolor/48x48/apps
@@ -21,7 +23,7 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(UUID_CFLAGS) \
 	    $(LIBSOUP_CFLAGS) \
 	    -I$(top_srcdir) \
-	    -DDATA_DIR='"$(shareddir)"' -DSYS_CONFIG_DIR='"$(sysconfdir)"'\
+	    -DDATA_DIR='"$(shareddir)"' -DSYS_CONFIG_DIR='"$(sysconfigdir)"'\
 	    -DPLUGIN_DIR='"$(plugindir)"' -DDESKTOP_DIR='"$(desktopdir)"'\
 	    -DSMALL_ICON_DIR='"$(smallicondir)"' \
 	    -DBIG_ICON_DIR='"$(bigicondir)"' -include config.h \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]